Skip to content

Commit df1b737

Browse files
authored
fix compatibility with elixir 1.15 (#570)
1 parent e557316 commit df1b737

7 files changed

Lines changed: 9 additions & 7 deletions

File tree

lib/membrane/core/child.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ defmodule Membrane.Core.Child do
2323
doc -> doc
2424
end
2525

26-
if moduledoc != false do
26+
if is_binary(moduledoc) and String.valid?(moduledoc) do
2727
moduledoc =
2828
if String.trim(moduledoc) == "" do
2929
"Membrane #{child_type}.\n\n"

lib/membrane/core/child/pads_specs.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ defmodule Membrane.Core.Child.PadsSpecs do
5454

5555
for format <- accepted_formats do
5656
with :any <- format do
57-
Membrane.Logger.warn("""
57+
Membrane.Logger.warning("""
5858
Remeber, that `accepted_format: :any` in pad definition will be satisified by stream format in form of %:any{}, \
5959
not >>any<< stream format (to achieve such an effect, put `accepted_format: _any` in your code)
6060
""")

lib/membrane/core/observability.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ defmodule Membrane.Core.Observability do
3939
else: {pid_string, "", " (#{component_type})"}
4040

4141
name_suffix = if component_type == :element, do: "", else: "/"
42-
name_str = if(String.valid?(name), do: name, else: inspect(name)) <> name_suffix
42+
43+
name_str =
44+
if(is_binary(name) and String.valid?(name), do: name, else: inspect(name)) <> name_suffix
4345

4446
register_name_for_observer(
4547
:"##{unique_prefix}#{name_str}#{component_type_suffix}#{utility_name}"

lib/membrane/core/parent/child_life_controller.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ defmodule Membrane.Core.Parent.ChildLifeController do
479479
{already_removing, data} = Enum.split_with(data, & &1.terminating?)
480480

481481
if already_removing != [] do
482-
Membrane.Logger.warn("""
482+
Membrane.Logger.warning("""
483483
Trying to remove children that are already being removed: #{Enum.map_join(already_removing, ", ", &inspect(&1.name))}. This may lead to 'unknown child' errors.
484484
""")
485485
end

lib/membrane/core/parent/specification_parser.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ defmodule Membrane.Core.Parent.SpecificationParser do
2727
|> Enum.map(fn
2828
%ChildrenSpec.Builder{links: links, children: children, status: :done} = builder ->
2929
if links == [] and children == [] do
30-
Membrane.Logger.warn(
30+
Membrane.Logger.warning(
3131
"The specification you have passed: #{builder} has no effect - it doesn't produce any children nor links."
3232
)
3333
end

lib/membrane/filter_aggregator.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ defmodule Membrane.FilterAggregator do
3636
@impl true
3737
def handle_init(agg_ctx, %__MODULE__{filters: filter_specs}) do
3838
if filter_specs == [] do
39-
Membrane.Logger.warn("No filters provided, #{inspect(__MODULE__)} will be a no-op")
39+
Membrane.Logger.warning("No filters provided, #{inspect(__MODULE__)} will be a no-op")
4040
end
4141

4242
states =

lib/membrane/logger.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ defmodule Membrane.Logger do
7979
end
8080
end
8181

82-
Enum.map([:debug, :info, :warn, :error], fn method ->
82+
Enum.map([:debug, :info, :warn, :warning, :error], fn method ->
8383
@doc """
8484
Wrapper around `Logger.#{method}/2` that adds Membrane prefix.
8585

0 commit comments

Comments
 (0)