Skip to content

Commit 0d4cc0a

Browse files
authored
Merge branch 'rust-lang:master' into master
2 parents cac85d8 + b3c7a7e commit 0d4cc0a

File tree

1,581 files changed

+31449
-21461
lines changed

Some content is hidden

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

1,581 files changed

+31449
-21461
lines changed

.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ trim_trailing_whitespace = true
1111
insert_final_newline = true
1212
indent_style = space
1313
indent_size = 4
14+
15+
[*.rs]
1416
max_line_length = 100
1517

1618
[*.md]

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ cf2dff2b1e3fa55fa5415d524200070d0d7aacfe
1616
b39a1d6f1a30ba29f25d7141038b9a5bf0126e36
1717
# reorder fluent message files
1818
f97fddab91fbf290ea5b691fe355d6f915220b6e
19+
# format let-else
20+
cc907f80b95c6ec530c5ee1b05b044a468f07eca

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ jobs:
315315
NO_DEBUG_ASSERTIONS: 1
316316
NO_OVERFLOW_CHECKS: 1
317317
DIST_REQUIRE_ALL_TOOLS: 1
318-
os: macos-latest
318+
os: macos-13
319319
- name: dist-apple-various
320320
env:
321321
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -326,7 +326,7 @@ jobs:
326326
NO_LLVM_ASSERTIONS: 1
327327
NO_DEBUG_ASSERTIONS: 1
328328
NO_OVERFLOW_CHECKS: 1
329-
os: macos-latest
329+
os: macos-13
330330
- name: dist-x86_64-apple-alt
331331
env:
332332
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -337,7 +337,7 @@ jobs:
337337
NO_LLVM_ASSERTIONS: 1
338338
NO_DEBUG_ASSERTIONS: 1
339339
NO_OVERFLOW_CHECKS: 1
340-
os: macos-latest
340+
os: macos-13
341341
- name: x86_64-apple-1
342342
env:
343343
SCRIPT: "./x.py --stage 2 test --exclude tests/ui --exclude tests/rustdoc --exclude tests/run-make-fulldeps"
@@ -348,7 +348,7 @@ jobs:
348348
NO_LLVM_ASSERTIONS: 1
349349
NO_DEBUG_ASSERTIONS: 1
350350
NO_OVERFLOW_CHECKS: 1
351-
os: macos-latest
351+
os: macos-13
352352
- name: x86_64-apple-2
353353
env:
354354
SCRIPT: "./x.py --stage 2 test tests/ui tests/rustdoc tests/run-make-fulldeps"
@@ -359,7 +359,7 @@ jobs:
359359
NO_LLVM_ASSERTIONS: 1
360360
NO_DEBUG_ASSERTIONS: 1
361361
NO_OVERFLOW_CHECKS: 1
362-
os: macos-latest
362+
os: macos-13
363363
- name: dist-aarch64-apple
364364
env:
365365
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -374,7 +374,7 @@ jobs:
374374
NO_OVERFLOW_CHECKS: 1
375375
DIST_REQUIRE_ALL_TOOLS: 1
376376
JEMALLOC_SYS_WITH_LG_PAGE: 14
377-
os: macos-latest
377+
os: macos-13
378378
- name: x86_64-msvc
379379
env:
380380
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

.mailmap

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,14 @@ Joseph T. Lyons <[email protected]> <[email protected]>
299299
Josh Cotton <[email protected]>
300300
Josh Driver <[email protected]>
301301
Josh Holmer <[email protected]>
302-
303302
Julian Knodt <[email protected]>
304303
305304
Junyoung Cho <[email protected]>
305+
306+
307+
308+
309+
Jynn Nelson <[email protected]>
306310
307311
Kalita Alexey <[email protected]>
308312
Kampfkarren <[email protected]>

Cargo.lock

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,9 +1529,9 @@ dependencies = [
15291529

15301530
[[package]]
15311531
name = "hermit-abi"
1532-
version = "0.3.1"
1532+
version = "0.3.2"
15331533
source = "registry+https://github.com/rust-lang/crates.io-index"
1534-
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
1534+
checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
15351535
dependencies = [
15361536
"compiler_builtins",
15371537
"rustc-std-workspace-alloc",
@@ -1864,7 +1864,7 @@ version = "1.0.11"
18641864
source = "registry+https://github.com/rust-lang/crates.io-index"
18651865
checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
18661866
dependencies = [
1867-
"hermit-abi 0.3.1",
1867+
"hermit-abi 0.3.2",
18681868
"libc",
18691869
"windows-sys 0.48.0",
18701870
]
@@ -1881,7 +1881,7 @@ version = "0.4.8"
18811881
source = "registry+https://github.com/rust-lang/crates.io-index"
18821882
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
18831883
dependencies = [
1884-
"hermit-abi 0.3.1",
1884+
"hermit-abi 0.3.2",
18851885
"rustix 0.38.2",
18861886
"windows-sys 0.48.0",
18871887
]
@@ -2396,7 +2396,7 @@ version = "1.16.0"
23962396
source = "registry+https://github.com/rust-lang/crates.io-index"
23972397
checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
23982398
dependencies = [
2399-
"hermit-abi 0.3.1",
2399+
"hermit-abi 0.3.2",
24002400
"libc",
24012401
]
24022402

@@ -3021,7 +3021,6 @@ dependencies = [
30213021
name = "rls"
30223022
version = "2.0.0"
30233023
dependencies = [
3024-
"serde",
30253024
"serde_json",
30263025
]
30273026

@@ -3666,6 +3665,7 @@ name = "rustc_hir_typeck"
36663665
version = "0.1.0"
36673666
dependencies = [
36683667
"rustc_ast",
3668+
"rustc_attr",
36693669
"rustc_data_structures",
36703670
"rustc_errors",
36713671
"rustc_fluent_macro",
@@ -4234,6 +4234,7 @@ dependencies = [
42344234
"rustc_hir",
42354235
"rustc_middle",
42364236
"rustc_span",
4237+
"rustc_target",
42374238
"scoped-tls",
42384239
"tracing",
42394240
]
@@ -4819,7 +4820,7 @@ dependencies = [
48194820
"dlmalloc",
48204821
"fortanix-sgx-abi",
48214822
"hashbrown 0.14.0",
4822-
"hermit-abi 0.3.1",
4823+
"hermit-abi 0.3.2",
48234824
"libc",
48244825
"miniz_oxide",
48254826
"object",

RELEASES.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ Stabilized APIs
203203
- [`Default for std::collections::binary_heap::IntoIter`](https://doc.rust-lang.org/stable/std/collections/binary_heap/struct.IntoIter.html)
204204
- [`Default for std::collections::btree_map::{IntoIter, Iter, IterMut}`](https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoIter.html)
205205
- [`Default for std::collections::btree_map::{IntoKeys, Keys}`](https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html)
206-
- [`Default for std::collections::btree_map::{IntoValues, Values}`](https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoKeys.html)
206+
- [`Default for std::collections::btree_map::{IntoValues, Values}`](https://doc.rust-lang.org/stable/std/collections/btree_map/struct.IntoValues.html)
207207
- [`Default for std::collections::btree_map::Range`](https://doc.rust-lang.org/stable/std/collections/btree_map/struct.Range.html)
208208
- [`Default for std::collections::btree_set::{IntoIter, Iter}`](https://doc.rust-lang.org/stable/std/collections/btree_set/struct.IntoIter.html)
209209
- [`Default for std::collections::btree_set::Range`](https://doc.rust-lang.org/stable/std/collections/btree_set/struct.Range.html)
@@ -2618,7 +2618,7 @@ related tools.
26182618
[`OsStr::to_ascii_lowercase`]: https://doc.rust-lang.org/std/ffi/struct.OsStr.html#method.to_ascii_lowercase
26192619
[`OsStr::to_ascii_uppercase`]: https://doc.rust-lang.org/std/ffi/struct.OsStr.html#method.to_ascii_uppercase
26202620
[`Peekable::peek_mut`]: https://doc.rust-lang.org/std/iter/struct.Peekable.html#method.peek_mut
2621-
[`Rc::decrement_strong_count`]: https://doc.rust-lang.org/std/rc/struct.Rc.html#method.increment_strong_count
2621+
[`Rc::decrement_strong_count`]: https://doc.rust-lang.org/std/rc/struct.Rc.html#method.decrement_strong_count
26222622
[`Rc::increment_strong_count`]: https://doc.rust-lang.org/std/rc/struct.Rc.html#method.increment_strong_count
26232623
[`Vec::extend_from_within`]: https://doc.rust-lang.org/beta/std/vec/struct.Vec.html#method.extend_from_within
26242624
[`array::from_mut`]: https://doc.rust-lang.org/beta/std/array/fn.from_mut.html
@@ -2627,7 +2627,7 @@ related tools.
26272627
[`cmp::max_by`]: https://doc.rust-lang.org/beta/std/cmp/fn.max_by.html
26282628
[`cmp::min_by_key`]: https://doc.rust-lang.org/beta/std/cmp/fn.min_by_key.html
26292629
[`cmp::min_by`]: https://doc.rust-lang.org/beta/std/cmp/fn.min_by.html
2630-
[`f32::is_subnormal`]: https://doc.rust-lang.org/std/primitive.f64.html#method.is_subnormal
2630+
[`f32::is_subnormal`]: https://doc.rust-lang.org/std/primitive.f32.html#method.is_subnormal
26312631
[`f64::is_subnormal`]: https://doc.rust-lang.org/std/primitive.f64.html#method.is_subnormal
26322632
[ietf6943]: https://datatracker.ietf.org/doc/html/rfc6943#section-3.1.1
26332633

@@ -2963,7 +2963,7 @@ Internal Only
29632963
[`sync::OnceState`]: https://doc.rust-lang.org/stable/std/sync/struct.OnceState.html
29642964
[`panic::panic_any`]: https://doc.rust-lang.org/stable/std/panic/fn.panic_any.html
29652965
[`slice::strip_prefix`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.strip_prefix
2966-
[`slice::strip_suffix`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.strip_prefix
2966+
[`slice::strip_suffix`]: https://doc.rust-lang.org/stable/std/primitive.slice.html#method.strip_suffix
29672967
[`Arc::increment_strong_count`]: https://doc.rust-lang.org/nightly/std/sync/struct.Arc.html#method.increment_strong_count
29682968
[`Arc::decrement_strong_count`]: https://doc.rust-lang.org/nightly/std/sync/struct.Arc.html#method.decrement_strong_count
29692969
[`slice::fill_with`]: https://doc.rust-lang.org/nightly/std/primitive.slice.html#method.fill_with
@@ -8033,7 +8033,7 @@ Compatibility Notes
80338033
[39379]: https://github.com/rust-lang/rust/pull/39379
80348034
[41105]: https://github.com/rust-lang/rust/issues/41105
80358035
[`<*const T>::wrapping_offset`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.wrapping_offset
8036-
[`<*mut T>::wrapping_offset`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.wrapping_offset
8036+
[`<*mut T>::wrapping_offset`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.wrapping_offset-1
80378037
[`Duration::checked_add`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.checked_add
80388038
[`Duration::checked_div`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.checked_div
80398039
[`Duration::checked_mul`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.checked_mul
@@ -9011,7 +9011,7 @@ Stabilized APIs
90119011
* [`f64::to_radians`](https://doc.rust-lang.org/std/primitive.f64.html#method.to_radians)
90129012
(in libcore - previously stabilized in libstd)
90139013
* [`Iterator::sum`](https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.sum)
9014-
* [`Iterator::product`](https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.sum)
9014+
* [`Iterator::product`](https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.product)
90159015
* [`Cell::get_mut`](https://doc.rust-lang.org/std/cell/struct.Cell.html#method.get_mut)
90169016
* [`RefCell::get_mut`](https://doc.rust-lang.org/std/cell/struct.RefCell.html#method.get_mut)
90179017

0 commit comments

Comments
 (0)