Skip to content

Commit 3a38b4f

Browse files
committed
Quote
1 parent 9962804 commit 3a38b4f

File tree

6 files changed

+37
-35
lines changed

6 files changed

+37
-35
lines changed

lib/consumer_supervisor.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ defmodule ConsumerSupervisor do
451451

452452
{:error, reason} ->
453453
:error_logger.error_msg(
454-
'ConsumerSupervisor failed to start child from: ~tp with reason: ~tp~n',
454+
~c"ConsumerSupervisor failed to start child from: ~tp with reason: ~tp~n",
455455
[from, reason]
456456
)
457457

@@ -471,7 +471,7 @@ defmodule ConsumerSupervisor do
471471
%{^ref => {to, count, pending, min, max}} ->
472472
if count + events > max do
473473
:error_logger.error_msg(
474-
'ConsumerSupervisor has received ~tp events in excess from: ~tp~n',
474+
~c"ConsumerSupervisor has received ~tp events in excess from: ~tp~n",
475475
[count + events - max, {pid, ref}]
476476
)
477477
end
@@ -629,7 +629,7 @@ defmodule ConsumerSupervisor do
629629
end
630630

631631
def handle_info(msg, state) do
632-
:error_logger.error_msg('ConsumerSupervisor received unexpected message: ~tp~n', [msg])
632+
:error_logger.error_msg(~c"ConsumerSupervisor received unexpected message: ~tp~n", [msg])
633633
{:noreply, [], state}
634634
end
635635

lib/gen_stage.ex

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@ defmodule GenStage do
19981998
## Producer messages
19991999

20002000
def handle_info({:"$gen_producer", _, _} = msg, %{type: :consumer} = stage) do
2001-
error_msg = 'GenStage consumer ~tp received $gen_producer message: ~tp~n'
2001+
error_msg = ~c"GenStage consumer ~tp received $gen_producer message: ~tp~n"
20022002
:error_logger.error_msg(error_msg, [Utils.self_name(), msg])
20032003
{:noreply, stage}
20042004
end
@@ -2009,7 +2009,7 @@ defmodule GenStage do
20092009
) do
20102010
case consumers do
20112011
%{^ref => _} ->
2012-
error_msg = 'GenStage producer ~tp received duplicated subscription from: ~tp~n'
2012+
error_msg = ~c"GenStage producer ~tp received duplicated subscription from: ~tp~n"
20132013
:error_logger.error_msg(error_msg, [Utils.self_name(), from])
20142014

20152015
msg = {:"$gen_consumer", {self(), ref}, {:cancel, :duplicated_subscription}}
@@ -2056,7 +2056,7 @@ defmodule GenStage do
20562056
## Consumer messages
20572057

20582058
def handle_info({:"$gen_consumer", _, _} = msg, %{type: :producer} = stage) do
2059-
error_msg = 'GenStage producer ~tp received $gen_consumer message: ~tp~n'
2059+
error_msg = ~c"GenStage producer ~tp received $gen_consumer message: ~tp~n"
20602060
:error_logger.error_msg(error_msg, [Utils.self_name(), msg])
20612061
{:noreply, stage}
20622062
end
@@ -2199,7 +2199,7 @@ defmodule GenStage do
21992199
if function_exported?(mod, :handle_info, 2) do
22002200
handle_noreply_callback(mod.handle_info(msg, state), stage)
22012201
else
2202-
log = '** Undefined handle_info in ~tp~n** Unhandled message: ~tp~n'
2202+
log = ~c"** Undefined handle_info in ~tp~n** Unhandled message: ~tp~n"
22032203
:error_logger.warning_msg(log, [mod, msg])
22042204
{:noreply, %{stage | state: state}}
22052205
end
@@ -2251,7 +2251,7 @@ defmodule GenStage do
22512251
end
22522252

22532253
defp producer_demand(_mode, %{type: type} = stage) when type != :producer do
2254-
error_msg = 'Demand mode can only be set for producers, GenStage ~tp is a ~ts'
2254+
error_msg = ~c"Demand mode can only be set for producers, GenStage ~tp is a ~ts"
22552255
:error_logger.error_msg(error_msg, [Utils.self_name(), type])
22562256
{:noreply, stage}
22572257
end
@@ -2389,7 +2389,7 @@ defmodule GenStage do
23892389

23902390
defp dispatch_events(events, _length, %{type: :consumer} = stage) do
23912391
error_msg =
2392-
'GenStage consumer ~tp cannot dispatch events (an empty list must be returned): ~tp~n'
2392+
~c"GenStage consumer ~tp cannot dispatch events (an empty list must be returned): ~tp~n"
23932393

23942394
:error_logger.error_msg(error_msg, [Utils.self_name(), events])
23952395
stage
@@ -2452,7 +2452,7 @@ defmodule GenStage do
24522452

24532453
excess ->
24542454
if maybe_format_discarded(mod, excess, state) do
2455-
error_msg = 'GenStage producer ~tp has discarded ~tp events from buffer'
2455+
error_msg = ~c"GenStage producer ~tp has discarded ~tp events from buffer"
24562456
:error_logger.warning_msg(error_msg, [Utils.self_name(), excess])
24572457
end
24582458
end
@@ -2461,7 +2461,7 @@ defmodule GenStage do
24612461
end
24622462

24632463
defp producer_estimate_buffered_count(%{type: :consumer} = stage) do
2464-
error_msg = 'Buffered count can only be requested for producers, GenStage ~tp is a consumer'
2464+
error_msg = ~c"Buffered count can only be requested for producers, GenStage ~tp is a consumer"
24652465
:error_logger.error_msg(error_msg, [Utils.self_name()])
24662466
{:reply, 0, stage}
24672467
end
@@ -2526,14 +2526,14 @@ defmodule GenStage do
25262526
end
25272527

25282528
defp maybe_print_subscribe_to_deprecation_warning(to) do
2529-
log = ':subscribe_to value with type ~ts is deprecated. Change ~tp to {~tp, []} instead.'
2529+
log = ~c":subscribe_to value with type ~ts is deprecated. Change ~tp to {~tp, []} instead."
25302530

25312531
case to do
25322532
{:global, _} ->
2533-
:error_logger.warning_msg(log, ['{:global, term()}', to, to])
2533+
:error_logger.warning_msg(log, [~c"{:global, term()}", to, to])
25342534

25352535
{:via, _, _} ->
2536-
:error_logger.warning_msg(log, ['{:via, module(), term()}', to, to])
2536+
:error_logger.warning_msg(log, [~c"{:via, module(), term()}", to, to])
25372537

25382538
_ ->
25392539
:ok
@@ -2584,7 +2584,7 @@ defmodule GenStage do
25842584
defp consumer_subscribe(to, stage), do: consumer_subscribe(nil, to, [], stage)
25852585

25862586
defp consumer_subscribe(_cancel, to, _opts, %{type: :producer} = stage) do
2587-
error_msg = 'GenStage producer ~tp cannot be subscribed to another stage: ~tp~n'
2587+
error_msg = ~c"GenStage producer ~tp cannot be subscribed to another stage: ~tp~n"
25882588
:error_logger.error_msg(error_msg, [Utils.self_name(), to])
25892589
{:reply, {:error, :not_a_consumer}, stage}
25902590
end
@@ -2606,7 +2606,7 @@ defmodule GenStage do
26062606

26072607
cancel == :permanent or cancel == :transient ->
26082608
error_msg =
2609-
'GenStage consumer ~tp was not able to subscribe to the process ~tp because that process is not alive~n'
2609+
~c"GenStage consumer ~tp was not able to subscribe to the process ~tp because that process is not alive~n"
26102610

26112611
mod =
26122612
case stage do
@@ -2622,7 +2622,7 @@ defmodule GenStage do
26222622
end
26232623
else
26242624
{:error, message} ->
2625-
error_msg = 'GenStage consumer ~tp subscribe received invalid option: ~ts~n'
2625+
error_msg = ~c"GenStage consumer ~tp subscribe received invalid option: ~ts~n"
26262626
:error_logger.error_msg(error_msg, [Utils.self_name(), message])
26272627
{:reply, {:error, {:bad_opts, message}}, stage}
26282628
end
@@ -2691,7 +2691,7 @@ defmodule GenStage do
26912691

26922692
_other ->
26932693
error_msg =
2694-
'GenStage consumer ~tp is stopping after receiving cancel from producer ~tp with reason: ~tp~n'
2694+
~c"GenStage consumer ~tp is stopping after receiving cancel from producer ~tp with reason: ~tp~n"
26952695

26962696
:error_logger.info_msg(error_msg, [Utils.self_name(), pid, reason])
26972697
{:stop, reason, stage}

lib/gen_stage/dispatchers/demand_dispatcher.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ defmodule GenStage.DemandDispatcher do
5858

5959
if counter > max do
6060
warning =
61-
'GenStage producer DemandDispatcher expects a maximum demand of ~tp. ' ++
62-
'Using different maximum demands will overload greedy consumers. ' ++
63-
'Got demand for ~tp events from ~tp~n'
61+
~c"GenStage producer DemandDispatcher expects a maximum demand of ~tp. " ++
62+
~c"Using different maximum demands will overload greedy consumers. " ++
63+
~c"Got demand for ~tp events from ~tp~n"
6464

6565
:error_logger.warning_msg(warning, [max, counter, pid])
6666
end

lib/gen_stage/streamer.ex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ defmodule GenStage.Streamer do
3737
end
3838

3939
def handle_info(msg, {stack, continuation}) do
40-
log = '** Undefined handle_info in ~tp~n** Unhandled message: ~tp~n** Stream started at:~n~ts'
40+
log =
41+
~c"** Undefined handle_info in ~tp~n** Unhandled message: ~tp~n** Stream started at:~n~ts"
42+
4143
:error_logger.warning_msg(log, [inspect(__MODULE__), msg, Exception.format_stacktrace(stack)])
4244
{:noreply, [], {stack, continuation}}
4345
end

lib/gen_stage/utils.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ defmodule GenStage.Utils do
108108
{old_demand, batch_size} =
109109
case old_demand - batch_size do
110110
diff when diff < 0 ->
111-
error_msg = 'GenStage consumer ~tp has received ~tp events in excess from: ~tp~n'
111+
error_msg = ~c"GenStage consumer ~tp has received ~tp events in excess from: ~tp~n"
112112
:error_logger.error_msg(error_msg, [self_name(), abs(diff), from])
113113
{0, old_demand}
114114

test/gen_stage_test.exs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,11 +1355,11 @@ defmodule GenStageTest do
13551355
:sys.get_status(producer)
13561356

13571357
assert data == [
1358-
{'State', self()},
1359-
{'Stage', :producer},
1360-
{'Dispatcher', GenStage.DemandDispatcher},
1361-
{'Consumers', [consumer]},
1362-
{'Buffer size', 0}
1358+
{~c"State", self()},
1359+
{~c"Stage", :producer},
1360+
{~c"Dispatcher", GenStage.DemandDispatcher},
1361+
{~c"Consumers", [consumer]},
1362+
{~c"Buffer size", 0}
13631363
]
13641364
end
13651365
end
@@ -1501,7 +1501,7 @@ defmodule GenStageTest do
15011501
assert {:status, _, _, [_, _, _, _, [header: _, data: _, data: data]]} =
15021502
:sys.get_status(consumer)
15031503

1504-
assert data == [{'State', self()}, {'Stage', :consumer}, {'Producers', [producer]}]
1504+
assert data == [{~c"State", self()}, {~c"Stage", :consumer}, {~c"Producers", [producer]}]
15051505
end
15061506
end
15071507

@@ -1667,12 +1667,12 @@ defmodule GenStageTest do
16671667
:sys.get_status(producer_consumer)
16681668

16691669
assert data == [
1670-
{'State', self()},
1671-
{'Stage', :producer_consumer},
1672-
{'Dispatcher', GenStage.DemandDispatcher},
1673-
{'Producers', [producer]},
1674-
{'Consumers', [consumer]},
1675-
{'Buffer size', 0}
1670+
{~c"State", self()},
1671+
{~c"Stage", :producer_consumer},
1672+
{~c"Dispatcher", GenStage.DemandDispatcher},
1673+
{~c"Producers", [producer]},
1674+
{~c"Consumers", [consumer]},
1675+
{~c"Buffer size", 0}
16761676
]
16771677
end
16781678
end

0 commit comments

Comments
 (0)