Skip to content

Commit af5f172

Browse files
authored
Merge branch 'main' into domain-keys-in-map
2 parents 48a0e5c + bbe1709 commit af5f172

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+629
-288
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5454
with:
5555
fetch-depth: 50
56-
- uses: erlef/setup-beam@75edbb82877ab10edeb12a99c3cf2f0909f3dc87 # v1.20.1
56+
- uses: erlef/setup-beam@8e7fdef09ffa3ea54328b5000c170a3b9b20ca96 # v1.20.3
5757
with:
5858
otp-version: ${{ matrix.otp_version }}
5959
- name: Set ERL_COMPILER_OPTIONS
@@ -114,7 +114,7 @@ jobs:
114114
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
115115
with:
116116
fetch-depth: 50
117-
- uses: erlef/setup-beam@75edbb82877ab10edeb12a99c3cf2f0909f3dc87 # v1.20.1
117+
- uses: erlef/setup-beam@8e7fdef09ffa3ea54328b5000c170a3b9b20ca96 # v1.20.3
118118
with:
119119
otp-version: ${{ matrix.otp_version }}
120120
- name: Compile Elixir

.github/workflows/notify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
fetch-depth: 50
22-
- uses: erlef/setup-beam@75edbb82877ab10edeb12a99c3cf2f0909f3dc87 # v1.20.1
22+
- uses: erlef/setup-beam@8e7fdef09ffa3ea54328b5000c170a3b9b20ca96 # v1.20.3
2323
with:
2424
otp-version: "27.3"
2525
elixir-version: "1.18.3"

lib/elixir/lib/calendar/date.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ defmodule Date do
321321
@doc """
322322
Converts the given date to a string according to its calendar.
323323
324-
### Examples
324+
## Examples
325325
326326
iex> Date.to_string(~D[2000-02-28])
327327
"2000-02-28"
@@ -399,7 +399,7 @@ defmodule Date do
399399
or other calendars in which the days also start at midnight.
400400
Attempting to convert dates from other calendars will raise an `ArgumentError`.
401401
402-
### Examples
402+
## Examples
403403
404404
iex> Date.to_iso8601(~D[2000-02-28])
405405
"2000-02-28"
@@ -633,7 +633,7 @@ defmodule Date do
633633
## Examples
634634
635635
Imagine someone implements `Calendar.Holocene`, a calendar based on the
636-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
636+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
637637
year:
638638
639639
iex> Date.convert(~D[2000-01-01], Calendar.Holocene)
@@ -667,7 +667,7 @@ defmodule Date do
667667
## Examples
668668
669669
Imagine someone implements `Calendar.Holocene`, a calendar based on the
670-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
670+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
671671
year:
672672
673673
iex> Date.convert!(~D[2000-01-01], Calendar.Holocene)

lib/elixir/lib/calendar/datetime.ex

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ defmodule DateTime do
10461046
its abbreviation, which means information is lost when converting to such
10471047
format.
10481048
1049-
### Examples
1049+
## Examples
10501050
10511051
iex> dt = %DateTime{year: 2000, month: 2, day: 29, zone_abbr: "CET",
10521052
...> hour: 23, minute: 0, second: 7, microsecond: {0, 0},
@@ -1390,7 +1390,7 @@ defmodule DateTime do
13901390
custom (but relatively common) representation which appends the time
13911391
zone abbreviation and full name to the datetime.
13921392
1393-
### Examples
1393+
## Examples
13941394
13951395
iex> dt = %DateTime{year: 2000, month: 2, day: 29, zone_abbr: "CET",
13961396
...> hour: 23, minute: 0, second: 7, microsecond: {0, 0},
@@ -1636,7 +1636,7 @@ defmodule DateTime do
16361636
not currently supported in Elixir's standard library but it is available
16371637
by third-party libraries.
16381638
1639-
### Examples
1639+
## Examples
16401640
16411641
iex> dt = DateTime.from_naive!(~N[2018-11-15 10:00:00], "Europe/Copenhagen", FakeTimeZoneDatabase)
16421642
iex> dt |> DateTime.add(3600, :second, FakeTimeZoneDatabase)
@@ -1922,7 +1922,7 @@ defmodule DateTime do
19221922
## Examples
19231923
19241924
Imagine someone implements `Calendar.Holocene`, a calendar based on the
1925-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
1925+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
19261926
year:
19271927
19281928
iex> dt1 = %DateTime{year: 2000, month: 2, day: 29, zone_abbr: "AMT",
@@ -1969,7 +1969,7 @@ defmodule DateTime do
19691969
## Examples
19701970
19711971
Imagine someone implements `Calendar.Holocene`, a calendar based on the
1972-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
1972+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
19731973
year:
19741974
19751975
iex> dt1 = %DateTime{year: 2000, month: 2, day: 29, zone_abbr: "AMT",

lib/elixir/lib/calendar/naive_datetime.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ defmodule NaiveDateTime do
761761
For readability, this function follows the RFC3339 suggestion of removing
762762
the "T" separator between the date and time components.
763763
764-
### Examples
764+
## Examples
765765
766766
iex> NaiveDateTime.to_string(~N[2000-02-28 23:00:13])
767767
"2000-02-28 23:00:13"
@@ -908,7 +908,7 @@ defmodule NaiveDateTime do
908908
Only supports converting naive datetimes which are in the ISO calendar,
909909
attempting to convert naive datetimes from other calendars will raise.
910910
911-
### Examples
911+
## Examples
912912
913913
iex> NaiveDateTime.to_iso8601(~N[2000-02-28 23:00:13])
914914
"2000-02-28T23:00:13"
@@ -1261,7 +1261,7 @@ defmodule NaiveDateTime do
12611261
## Examples
12621262
12631263
Imagine someone implements `Calendar.Holocene`, a calendar based on the
1264-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
1264+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
12651265
year:
12661266
12671267
iex> NaiveDateTime.convert(~N[2000-01-01 13:30:15], Calendar.Holocene)
@@ -1327,7 +1327,7 @@ defmodule NaiveDateTime do
13271327
## Examples
13281328
13291329
Imagine someone implements `Calendar.Holocene`, a calendar based on the
1330-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
1330+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
13311331
year:
13321332
13331333
iex> NaiveDateTime.convert!(~N[2000-01-01 13:30:15], Calendar.Holocene)

lib/elixir/lib/calendar/time.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ defmodule Time do
225225
@doc """
226226
Converts the given `time` to a string.
227227
228-
### Examples
228+
## Examples
229229
230230
iex> Time.to_string(~T[23:00:00])
231231
"23:00:00"
@@ -334,7 +334,7 @@ defmodule Time do
334334
format, for human readability. It also supports the "basic" format through
335335
passing the `:basic` option.
336336
337-
### Examples
337+
## Examples
338338
339339
iex> Time.to_iso8601(~T[23:00:13])
340340
"23:00:13"
@@ -781,7 +781,7 @@ defmodule Time do
781781
## Examples
782782
783783
Imagine someone implements `Calendar.Holocene`, a calendar based on the
784-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
784+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
785785
year:
786786
787787
iex> Time.convert(~T[13:30:15], Calendar.Holocene)
@@ -837,7 +837,7 @@ defmodule Time do
837837
## Examples
838838
839839
Imagine someone implements `Calendar.Holocene`, a calendar based on the
840-
Gregorian calendar that adds exactly 10,000 years to the current Gregorian
840+
Gregorian calendar that adds exactly 10000 years to the current Gregorian
841841
year:
842842
843843
iex> Time.convert!(~T[13:30:15], Calendar.Holocene)

lib/elixir/lib/code.ex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ defmodule Code do
725725
* `:line` - the line the string starts, used for error reporting
726726
727727
* `:line_length` - the line length to aim for when formatting
728-
the document. Defaults to 98. This value indicates when an expression
728+
the document. Defaults to `98`. This value indicates when an expression
729729
should be broken over multiple lines but it is not guaranteed
730730
to do so. See the "Line length" section below for more information
731731
@@ -1227,14 +1227,14 @@ defmodule Code do
12271227
Defaults to `"nofile"`.
12281228
12291229
* `:line` - the starting line of the string being parsed.
1230-
Defaults to 1.
1230+
Defaults to `1`.
12311231
12321232
* `:column` - (since v1.11.0) the starting column of the string being parsed.
1233-
Defaults to 1.
1233+
Defaults to `1`.
12341234
12351235
* `:indentation` - (since v1.19.0) the indentation for the string being parsed.
12361236
This is useful when the code parsed is embedded within another document.
1237-
Defaults to 0.
1237+
Defaults to `0`.
12381238
12391239
* `:columns` - when `true`, attach a `:column` key to the quoted
12401240
metadata. Defaults to `false`.

lib/elixir/lib/code/fragment.ex

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ defmodule Code.Fragment do
302302
{{:local_or_var, acc}, count} -> {{:local_arity, acc}, count}
303303
{{:dot, base, acc}, count} -> {{:dot_arity, base, acc}, count}
304304
{{:operator, acc}, count} -> {{:operator_arity, acc}, count}
305-
{_, _} -> {:none, 0}
305+
{{:sigil, _}, _} -> {:none, 0}
306+
{_, _} -> {{:operator, ~c"/"}, 1}
306307
end
307308
end
308309

@@ -335,7 +336,7 @@ defmodule Code.Fragment do
335336
end
336337

337338
defp identifier_to_cursor_context([?., ?., ?: | _], n, _), do: {{:unquoted_atom, ~c".."}, n + 3}
338-
defp identifier_to_cursor_context([?., ?., ?. | _], n, _), do: {{:local_or_var, ~c"..."}, n + 3}
339+
defp identifier_to_cursor_context([?., ?., ?. | _], n, _), do: {{:operator, ~c"..."}, n + 3}
339340
defp identifier_to_cursor_context([?., ?: | _], n, _), do: {{:unquoted_atom, ~c"."}, n + 2}
340341
defp identifier_to_cursor_context([?., ?. | _], n, _), do: {{:operator, ~c".."}, n + 2}
341342

@@ -1213,10 +1214,10 @@ defmodule Code.Fragment do
12131214
Defaults to `"nofile"`.
12141215
12151216
* `:line` - the starting line of the string being parsed.
1216-
Defaults to 1.
1217+
Defaults to `1`.
12171218
12181219
* `:column` - the starting column of the string being parsed.
1219-
Defaults to 1.
1220+
Defaults to `1`.
12201221
12211222
* `:columns` - when `true`, attach a `:column` key to the quoted
12221223
metadata. Defaults to `false`.

lib/elixir/lib/inspect/algebra.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ defmodule Inspect.Opts do
4646
* `:limit` - limits the number of items that are inspected for tuples,
4747
bitstrings, maps, lists and any other collection of items, with the exception of
4848
printable strings and printable charlists which use the `:printable_limit` option.
49-
It accepts a positive integer or `:infinity`. It defaults to 100 since
49+
It accepts a positive integer or `:infinity`. It defaults to `100` since
5050
`Elixir v1.19.0`, as it has better defaults to deal with nested collections.
5151
5252
* `:pretty` - if set to `true` enables pretty printing. Defaults to `false`.

lib/elixir/lib/kernel.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ defmodule Kernel do
231231
232232
Finally, note there is an overall structural sorting order, called
233233
"Term Ordering", defined below. This order is provided for reference
234-
purposes, it is not required by Elixir developers to know it by heart.
234+
purposes, it is not required for Elixir developers to know it by heart.
235235
236236
### Term ordering
237237
@@ -2815,7 +2815,7 @@ defmodule Kernel do
28152815
This is most commonly used in pipelines, using the `|>/2` operator, allowing you
28162816
to pipe a value to a function outside of its first argument.
28172817
2818-
### Examples
2818+
## Examples
28192819
28202820
iex> 1 |> then(fn x -> x * 2 end)
28212821
2

0 commit comments

Comments
 (0)