Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/elixir/lib/config.ex
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ defmodule Config do
...
end

The only files where you may acccess functions from the `Mix` module are
The only files where you may access functions from the `Mix` module are
the `mix.exs` file and inside custom Mix tasks, which always within the
`Mix.Tasks` namespace.

Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/float.ex
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ defmodule Float do
## Known issues

There are some very well known problems with floating-point numbers
and arithmetics due to the fact most decimal fractions cannot be
and arithmetic due to the fact most decimal fractions cannot be
represented by a floating-point binary and most operations are not exact,
but operate on approximations. Those issues are not specific
to Elixir, they are a property of floating point representation itself.
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/kernel.ex
Original file line number Diff line number Diff line change
Expand Up @@ -2589,7 +2589,7 @@ defmodule Kernel do
[27, 23]

In case any of the components returns `nil`, `nil` will be returned
and `get_in/2` won't traverse any futher:
and `get_in/2` won't traverse any further:

iex> users = %{"john" => %{age: 27}, "meg" => %{age: 23}}
iex> get_in(users, ["unknown", :age])
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/lib/task.ex
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ defmodule Task do
the caller won't fail. You will receive the error reason either on
`yield` or `shutdown`.

Furthemore, the supervisor guarantee all tasks first terminate, within a
Furthermore, the supervisor guarantee all tasks first terminate, within a
configurable shutdown period, when your application shuts down. See the
`Task.Supervisor` module for details on the supported operations.

Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/test/elixir/kernel/errors_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ defmodule Kernel.ErrorsTest do
assert_eval_raise CompileError, "nofile:1: unquote called outside quote", 'unquote 1'
end

test "invalid unquote splicing in oneliners" do
test "invalid unquote splicing in one-liners" do
assert_eval_raise ArgumentError,
"unquote_splicing only works inside arguments and block contexts, " <>
"wrap it in parens if you want it to work with one-liners",
Expand Down
2 changes: 1 addition & 1 deletion lib/elixir/test/elixir/kernel/warning_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ defmodule Kernel.WarningTest do
\\u005F _
"""

# a is in cyrllic
# a is in cyrillic
assert_raise SyntaxError, ~r/mixed/, fn -> Code.string_to_quoted!("[аdmin: 1]") end
assert_raise SyntaxError, ~r/mixed/, fn -> Code.string_to_quoted!("[{:аdmin, 1}]") end
assert_raise SyntaxError, ~r/mixed/, fn -> Code.string_to_quoted!("quote do: аdmin(1)") end
Expand Down
4 changes: 2 additions & 2 deletions lib/elixir/test/elixir/module/types/pattern_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,13 @@ defmodule Module.Types.PatternTest do
) == {:ok, [{:map, [{:optional, :dynamic, :dynamic}]}]}
end

test "interesection functions" do
test "intersection functions" do
assert quoted_head([x], [+x]) == {:ok, [{:union, [:integer, :float]}]}
assert quoted_head([x], [x + 1]) == {:ok, [{:union, [:float, :integer]}]}
assert quoted_head([x], [x + 1.0]) == {:ok, [{:union, [:integer, :float]}]}
end

test "nested calls with interesections in guards" do
test "nested calls with intersections in guards" do
assert quoted_head([x], [:erlang.rem(x, 2)]) == {:ok, [:integer]}
assert quoted_head([x], [:erlang.rem(x + x, 2)]) == {:ok, [:integer]}

Expand Down
2 changes: 1 addition & 1 deletion lib/iex/lib/iex/helpers.ex
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ defmodule IEx.Helpers do

{result, _} = Mix.Task.run("compile", arguments)

# Reenable consolidation and allow them to be loaded.
# Re-enable consolidation and allow them to be loaded.
Code.prepend_path(consolidation)
purge_protocols(consolidation)

Expand Down
4 changes: 2 additions & 2 deletions lib/mix/lib/mix/task.ex
Original file line number Diff line number Diff line change
Expand Up @@ -524,10 +524,10 @@ defmodule Mix.Task do
@doc """
Reenables a given task so it can be executed again down the stack.

Both alias and the regular stack are reenabled when this function
Both alias and the regular stack are re-enabled when this function
is called.

If an umbrella project reenables a task, it is reenabled for all
If an umbrella project reenables a task, it is re-enabled for all
child projects.
"""
@spec reenable(task_name) :: :ok
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/cmd.ex
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ defmodule Mix.Tasks.Cmd do

The tasks aborts whenenever a command exits with a non-zero status.

This task is automatically reenabled, so it can be called multiple times
This task is automatically re-enabled, so it can be called multiple times
with different arguments.

## Command line options
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/deps.compile.ex
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ defmodule Mix.Tasks.Deps.Compile do
#
# TODO: We still symlink ebin/ by default for backwards compatibility.
# This partially negates the effects of REBAR_BARE_COMPILER_OUTPUT_DIR
# if an ebin diretory exists, so we should consider disabling it in future
# if an ebin directory exists, so we should consider disabling it in future
# releases when rebar3 v3.14+ is reasonably adopted.
config = Keyword.put(config, :app_path, build_path)
Mix.Project.build_structure(config, symlink_ebin: true, source: dep_path)
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/loadconfig.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Mix.Tasks.Loadconfig do
application. Therefore there is no need to load those config
files directly.

This task is automatically reenabled, so it can be called
This task is automatically re-enabled, so it can be called
multiple times to load different configs.
"""

Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/profile.cprof.ex
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defmodule Mix.Tasks.Profile.Cprof do
mix profile.cprof -e "[1, 2, 3] |> Enum.reverse |> Enum.map(&Integer.to_string/1)"
mix profile.cprof my_script.exs arg1 arg2 arg3

This task is automatically reenabled, so you can profile multiple times
This task is automatically re-enabled, so you can profile multiple times
in the same Mix invocation.

## Command line options
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/profile.eprof.ex
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defmodule Mix.Tasks.Profile.Eprof do
mix profile.eprof -e "[1, 2, 3] |> Enum.reverse |> Enum.map(&Integer.to_string/1)"
mix profile.eprof my_script.exs arg1 arg2 arg3

This task is automatically reenabled, so you can profile multiple times
This task is automatically re-enabled, so you can profile multiple times
in the same Mix invocation.

## Command line options
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/profile.fprof.ex
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ defmodule Mix.Tasks.Profile.Fprof do
mix profile.fprof -e Hello.world
mix profile.fprof my_script.exs arg1 arg2 arg3

This task is automatically reenabled, so you can profile multiple times
This task is automatically re-enabled, so you can profile multiple times
in the same Mix invocation.

## Command line options
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/run.ex
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ defmodule Mix.Tasks.Run do

elixir --sname hello -S mix run --no-halt

This task is automatically reenabled, so it can be called multiple times
This task is automatically re-enabled, so it can be called multiple times
with different arguments.

## Command-line options
Expand Down
2 changes: 1 addition & 1 deletion lib/mix/lib/mix/tasks/xref.ex
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule Mix.Tasks.Xref do

All available modes are discussed below.

This task is automatically reenabled, so you can print
This task is automatically re-enabled, so you can print
information multiple times in the same Mix invocation.

## mix xref callers MODULE
Expand Down