Skip to content

Commit 4a8fe8c

Browse files
BatmanAoDBatmanAoD
authored
Merge branch 'rust-lang:master' into catch-unwind-doc-update
2 parents 75dced3 + ab1527f commit 4a8fe8c

File tree

3,674 files changed

+37583
-25016
lines changed

Some content is hidden

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

3,674 files changed

+37583
-25016
lines changed

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ b2d2184edea578109a48ec3d8decbee5948e8f35
2323
# test directives migration
2424
6e48b96692d63a79a14563f27fe5185f122434f8
2525
ec2cc761bc7067712ecc7734502f703fe3b024c8
26+
# format use declarations
27+
84ac80f1921afc243d71fd0caaa4f2838c294102

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/18.1-2024-05-19
36+
branch = rustc/19.1-2024-07-30
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

‎Cargo.lock

+77-31
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,9 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
739739

740740
[[package]]
741741
name = "compiler_builtins"
742-
version = "0.1.109"
742+
version = "0.1.114"
743743
source = "registry+https://github.com/rust-lang/crates.io-index"
744-
checksum = "f11973008a8cf741fe6d22f339eba21fd0ca81e2760a769ba8243ed6c21edd7e"
744+
checksum = "eb58b199190fcfe0846f55a3b545cd6b07a34bdd5930a476ff856f3ebcc5558a"
745745
dependencies = [
746746
"cc",
747747
"rustc-std-workspace-core",
@@ -771,7 +771,7 @@ dependencies = [
771771
"tracing-subscriber",
772772
"unified-diff",
773773
"walkdir",
774-
"windows",
774+
"windows 0.52.0",
775775
]
776776

777777
[[package]]
@@ -1713,7 +1713,7 @@ dependencies = [
17131713
"iana-time-zone-haiku",
17141714
"js-sys",
17151715
"wasm-bindgen",
1716-
"windows-core",
1716+
"windows-core 0.52.0",
17171717
]
17181718

17191719
[[package]]
@@ -2436,15 +2436,6 @@ dependencies = [
24362436
"windows-sys 0.52.0",
24372437
]
24382438

2439-
[[package]]
2440-
name = "ntapi"
2441-
version = "0.4.1"
2442-
source = "registry+https://github.com/rust-lang/crates.io-index"
2443-
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
2444-
dependencies = [
2445-
"winapi",
2446-
]
2447-
24482439
[[package]]
24492440
name = "nu-ansi-term"
24502441
version = "0.46.0"
@@ -3291,20 +3282,22 @@ dependencies = [
32913282

32923283
[[package]]
32933284
name = "rinja"
3294-
version = "0.2.0"
3285+
version = "0.3.0"
32953286
source = "registry+https://github.com/rust-lang/crates.io-index"
3296-
checksum = "d2d47a46d7729e891c8accf260e9daa02ae6d570aa2a94fb1fb27eb5364a2323"
3287+
checksum = "6d3762e3740cdbf2fd2be465cc2c26d643ad17353cc2e0223d211c1b096118bd"
32973288
dependencies = [
3289+
"itoa",
32983290
"rinja_derive",
32993291
]
33003292

33013293
[[package]]
33023294
name = "rinja_derive"
3303-
version = "0.2.0"
3295+
version = "0.3.0"
33043296
source = "registry+https://github.com/rust-lang/crates.io-index"
3305-
checksum = "44dae9afe59d58ed8d988d67d1945f3638125d2fd2104058399382e11bd3ea2a"
3297+
checksum = "fd01fd8e15e7d19c8b8052c1d428325131e02ff1633cdcf695190c2e56ab682c"
33063298
dependencies = [
33073299
"basic-toml",
3300+
"memchr",
33083301
"mime",
33093302
"mime_guess",
33103303
"once_map",
@@ -3317,10 +3310,11 @@ dependencies = [
33173310

33183311
[[package]]
33193312
name = "rinja_parser"
3320-
version = "0.2.0"
3313+
version = "0.3.0"
33213314
source = "registry+https://github.com/rust-lang/crates.io-index"
3322-
checksum = "1b1771c78cd5d3b1646ef8d8f2ed100db936e8b291d3cc06e92a339ff346858c"
3315+
checksum = "a2f6bf7cef118c6de21206edf0b3f19f5ede60006be674a58ca21b6e003a1b57"
33233316
dependencies = [
3317+
"memchr",
33243318
"nom",
33253319
]
33263320

@@ -3717,7 +3711,7 @@ dependencies = [
37173711
"thorin-dwp",
37183712
"tracing",
37193713
"wasm-encoder 0.210.0",
3720-
"windows",
3714+
"windows 0.52.0",
37213715
]
37223716

37233717
[[package]]
@@ -3774,7 +3768,7 @@ dependencies = [
37743768
"tempfile",
37753769
"thin-vec",
37763770
"tracing",
3777-
"windows",
3771+
"windows 0.52.0",
37783772
]
37793773

37803774
[[package]]
@@ -3835,7 +3829,7 @@ dependencies = [
38353829
"shlex",
38363830
"time",
38373831
"tracing",
3838-
"windows",
3832+
"windows 0.52.0",
38393833
]
38403834

38413835
[[package]]
@@ -3886,7 +3880,7 @@ dependencies = [
38863880
"termcolor",
38873881
"termize",
38883882
"tracing",
3889-
"windows",
3883+
"windows 0.52.0",
38903884
]
38913885

38923886
[[package]]
@@ -4355,6 +4349,7 @@ dependencies = [
43554349
"rustc_span",
43564350
"rustc_target",
43574351
"rustc_trait_selection",
4352+
"rustc_type_ir",
43584353
"smallvec",
43594354
"tracing",
43604355
]
@@ -4607,7 +4602,7 @@ dependencies = [
46074602
"smallvec",
46084603
"termize",
46094604
"tracing",
4610-
"windows",
4605+
"windows 0.52.0",
46114606
]
46124607

46134608
[[package]]
@@ -4826,6 +4821,7 @@ dependencies = [
48264821
"tracing",
48274822
"tracing-subscriber",
48284823
"tracing-tree",
4824+
"unicode-segmentation",
48294825
]
48304826

48314827
[[package]]
@@ -5364,16 +5360,13 @@ dependencies = [
53645360

53655361
[[package]]
53665362
name = "sysinfo"
5367-
version = "0.30.12"
5363+
version = "0.31.2"
53685364
source = "registry+https://github.com/rust-lang/crates.io-index"
5369-
checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae"
5365+
checksum = "d4115055da5f572fff541dd0c4e61b0262977f453cc9fe04be83aba25a89bdab"
53705366
dependencies = [
5371-
"cfg-if",
53725367
"core-foundation-sys",
53735368
"libc",
5374-
"ntapi",
5375-
"once_cell",
5376-
"windows",
5369+
"windows 0.57.0",
53775370
]
53785371

53795372
[[package]]
@@ -6298,7 +6291,17 @@ version = "0.52.0"
62986291
source = "registry+https://github.com/rust-lang/crates.io-index"
62996292
checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
63006293
dependencies = [
6301-
"windows-core",
6294+
"windows-core 0.52.0",
6295+
"windows-targets 0.52.5",
6296+
]
6297+
6298+
[[package]]
6299+
name = "windows"
6300+
version = "0.57.0"
6301+
source = "registry+https://github.com/rust-lang/crates.io-index"
6302+
checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
6303+
dependencies = [
6304+
"windows-core 0.57.0",
63026305
"windows-targets 0.52.5",
63036306
]
63046307

@@ -6325,12 +6328,55 @@ dependencies = [
63256328
"windows-targets 0.52.5",
63266329
]
63276330

6331+
[[package]]
6332+
name = "windows-core"
6333+
version = "0.57.0"
6334+
source = "registry+https://github.com/rust-lang/crates.io-index"
6335+
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
6336+
dependencies = [
6337+
"windows-implement",
6338+
"windows-interface",
6339+
"windows-result",
6340+
"windows-targets 0.52.5",
6341+
]
6342+
6343+
[[package]]
6344+
name = "windows-implement"
6345+
version = "0.57.0"
6346+
source = "registry+https://github.com/rust-lang/crates.io-index"
6347+
checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
6348+
dependencies = [
6349+
"proc-macro2",
6350+
"quote",
6351+
"syn 2.0.67",
6352+
]
6353+
6354+
[[package]]
6355+
name = "windows-interface"
6356+
version = "0.57.0"
6357+
source = "registry+https://github.com/rust-lang/crates.io-index"
6358+
checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
6359+
dependencies = [
6360+
"proc-macro2",
6361+
"quote",
6362+
"syn 2.0.67",
6363+
]
6364+
63286365
[[package]]
63296366
name = "windows-metadata"
63306367
version = "0.58.0"
63316368
source = "registry+https://github.com/rust-lang/crates.io-index"
63326369
checksum = "2e837f3c3012cfe9e7086302a93f441a7999439be1ad4c530d55d2f6d2921809"
63336370

6371+
[[package]]
6372+
name = "windows-result"
6373+
version = "0.1.2"
6374+
source = "registry+https://github.com/rust-lang/crates.io-index"
6375+
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
6376+
dependencies = [
6377+
"windows-targets 0.52.5",
6378+
]
6379+
63346380
[[package]]
63356381
name = "windows-sys"
63366382
version = "0.48.0"

‎compiler/rustc_abi/src/layout.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
use std::borrow::{Borrow, Cow};
2-
use std::cmp;
32
use std::fmt::{self, Write};
4-
use std::iter;
5-
use std::ops::Bound;
6-
use std::ops::Deref;
3+
use std::ops::{Bound, Deref};
4+
use std::{cmp, iter};
75

86
use rustc_index::Idx;
97
use tracing::debug;
@@ -982,7 +980,8 @@ fn univariant<
982980
if repr.can_randomize_type_layout() && cfg!(feature = "randomize") {
983981
#[cfg(feature = "randomize")]
984982
{
985-
use rand::{seq::SliceRandom, SeedableRng};
983+
use rand::seq::SliceRandom;
984+
use rand::SeedableRng;
986985
// `ReprOptions.field_shuffle_seed` is a deterministic seed we can use to randomize field
987986
// ordering.
988987
let mut rng =

‎compiler/rustc_abi/src/lib.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@
66
// tidy-alphabetical-end
77

88
use std::fmt;
9+
#[cfg(feature = "nightly")]
10+
use std::iter::Step;
911
use std::num::{NonZeroUsize, ParseIntError};
1012
use std::ops::{Add, AddAssign, Mul, RangeInclusive, Sub};
1113
use std::str::FromStr;
1214

1315
use bitflags::bitflags;
14-
use rustc_index::{Idx, IndexSlice, IndexVec};
15-
1616
#[cfg(feature = "nightly")]
1717
use rustc_data_structures::stable_hasher::StableOrd;
18+
use rustc_index::{Idx, IndexSlice, IndexVec};
1819
#[cfg(feature = "nightly")]
1920
use rustc_macros::HashStable_Generic;
2021
#[cfg(feature = "nightly")]
2122
use rustc_macros::{Decodable_Generic, Encodable_Generic};
22-
#[cfg(feature = "nightly")]
23-
use std::iter::Step;
2423

2524
mod layout;
2625
#[cfg(test)]
@@ -517,7 +516,7 @@ impl Size {
517516
/// Truncates `value` to `self` bits and then sign-extends it to 128 bits
518517
/// (i.e., if it is negative, fill with 1's on the left).
519518
#[inline]
520-
pub fn sign_extend(self, value: u128) -> u128 {
519+
pub fn sign_extend(self, value: u128) -> i128 {
521520
let size = self.bits();
522521
if size == 0 {
523522
// Truncated until nothing is left.
@@ -527,7 +526,7 @@ impl Size {
527526
let shift = 128 - size;
528527
// Shift the unsigned value to the left, then shift back to the right as signed
529528
// (essentially fills with sign bit on the left).
530-
(((value << shift) as i128) >> shift) as u128
529+
((value << shift) as i128) >> shift
531530
}
532531

533532
/// Truncates `value` to `self` bits.
@@ -545,7 +544,7 @@ impl Size {
545544

546545
#[inline]
547546
pub fn signed_int_min(&self) -> i128 {
548-
self.sign_extend(1_u128 << (self.bits() - 1)) as i128
547+
self.sign_extend(1_u128 << (self.bits() - 1))
549548
}
550549

551550
#[inline]

‎compiler/rustc_arena/src/lib.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,14 @@
2727
#![feature(strict_provenance)]
2828
// tidy-alphabetical-end
2929

30-
use smallvec::SmallVec;
31-
3230
use std::alloc::Layout;
3331
use std::cell::{Cell, RefCell};
3432
use std::marker::PhantomData;
3533
use std::mem::{self, MaybeUninit};
3634
use std::ptr::{self, NonNull};
37-
use std::slice;
38-
use std::{cmp, intrinsics};
35+
use std::{cmp, intrinsics, slice};
36+
37+
use smallvec::SmallVec;
3938

4039
/// This calls the passed function while ensuring it won't be inlined into the caller.
4140
#[inline(never)]

‎compiler/rustc_arena/src/tests.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
extern crate test;
2-
use super::TypedArena;
32
use std::cell::Cell;
3+
44
use test::Bencher;
55

6+
use super::TypedArena;
7+
68
#[allow(dead_code)]
79
#[derive(Debug, Eq, PartialEq)]
810
struct Point {

0 commit comments

Comments
 (0)