Skip to content

Commit

Permalink
Fix warnings on Elixir v1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Feb 8, 2025
1 parent e744f68 commit e81fb44
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions lib/table_rex/cell.ex
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ defmodule TableRex.Cell do
@spec to_cell(Cell.t()) :: Cell.t()
def to_cell(%Cell{rendered_value: rendered_value} = cell)
when is_binary(rendered_value) and rendered_value != "" do
%Cell{cell | wrapped_lines: wrapped_lines(rendered_value)}
%{cell | wrapped_lines: wrapped_lines(rendered_value)}
end

def to_cell(%Cell{raw_value: raw_value} = cell) do
rendered_value = to_string(raw_value)
%Cell{cell | rendered_value: rendered_value, wrapped_lines: wrapped_lines(rendered_value)}
%{cell | rendered_value: rendered_value, wrapped_lines: wrapped_lines(rendered_value)}
end

@spec to_cell(any, list) :: Cell.t()
Expand Down
2 changes: 1 addition & 1 deletion lib/table_rex/renderer/text.ex
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ defmodule TableRex.Renderer.Text do
row
|> Enum.map(fn %Cell{wrapped_lines: lines} = cell ->
line_value = Enum.at(lines, line_index - 1) || ""
%Cell{cell | rendered_value: line_value}
%{cell | rendered_value: line_value}
end)
|> Enum.with_index()
|> Enum.map(&render_cell(table, meta, &1))
Expand Down
22 changes: 11 additions & 11 deletions lib/table_rex/table.ex
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ defmodule TableRex.Table do
def put_title(%Table{} = table, ""), do: put_title(table, nil)

def put_title(%Table{} = table, title) when is_binary(title) or is_nil(title) do
%Table{table | title: title}
%{table | title: title}
end

@doc """
Expand All @@ -66,7 +66,7 @@ defmodule TableRex.Table do

def put_header(%Table{} = table, header_row) when is_list(header_row) do
new_header_row = Enum.map(header_row, &Cell.to_cell(&1))
%Table{table | header_row: new_header_row}
%{table | header_row: new_header_row}
end

@doc """
Expand All @@ -78,7 +78,7 @@ defmodule TableRex.Table do
col_meta = col_meta |> Enum.into(%{})
col = get_column(table, col_index) |> Map.merge(col_meta)
new_columns = Map.put(table.columns, col_index, col)
%Table{table | columns: new_columns}
%{table | columns: new_columns}
end

def put_column_meta(%Table{} = table, :all, col_meta) when is_list(col_meta) do
Expand All @@ -92,7 +92,7 @@ defmodule TableRex.Table do
Map.put(acc, col_index, new_col)
end)

%Table{table | columns: new_columns}
%{table | columns: new_columns}
end

def put_column_meta(%Table{} = table, col_indexes, col_meta) when is_list(col_meta) do
Expand All @@ -113,7 +113,7 @@ defmodule TableRex.Table do
List.update_at(row, col_index, &Map.merge(&1, cell_meta))
end)

%Table{table | rows: rows}
%{table | rows: rows}
end

@doc """
Expand All @@ -124,7 +124,7 @@ defmodule TableRex.Table do
when is_integer(col_index) and is_list(cell_meta) do
cell_meta = cell_meta |> Enum.into(%{})
header_row = List.update_at(table.header_row, col_index, &Map.merge(&1, cell_meta))
%Table{table | header_row: header_row}
%{table | header_row: header_row}
end

def put_header_meta(%Table{} = table, col_indexes, cell_meta) when is_list(cell_meta) do
Expand All @@ -137,7 +137,7 @@ defmodule TableRex.Table do
@spec add_row(Table.t(), list) :: Table.t()
def add_row(%Table{} = table, row) when is_list(row) do
new_row = Enum.map(row, &Cell.to_cell(&1))
%Table{table | rows: [new_row | table.rows]}
%{table | rows: [new_row | table.rows]}
end

@doc """
Expand All @@ -152,7 +152,7 @@ defmodule TableRex.Table do
Enum.map(row, &Cell.to_cell(&1))
end)

%Table{table | rows: rows ++ table.rows}
%{table | rows: rows ++ table.rows}
end

@doc """
Expand All @@ -161,15 +161,15 @@ defmodule TableRex.Table do
"""
@spec clear_all_column_meta(Table.t()) :: Table.t()
def clear_all_column_meta(%Table{} = table) do
%Table{table | columns: %{}}
%{table | columns: %{}}
end

@doc """
Removes all row data from the table, keeping everything else.
"""
@spec clear_rows(Table.t()) :: Table.t()
def clear_rows(%Table{} = table) do
%Table{table | rows: []}
%{table | rows: []}
end

@doc """
Expand Down Expand Up @@ -203,7 +203,7 @@ defmodule TableRex.Table do
end

def sort(table = %Table{rows: rows}, column_index, order) do
%Table{table | rows: Enum.sort(rows, build_sort_function(column_index, order))}
%{table | rows: Enum.sort(rows, build_sort_function(column_index, order))}
end

defp build_sort_function(column_index, order) when order in [:desc, :asc] do
Expand Down

0 comments on commit e81fb44

Please sign in to comment.