Skip to content

Commit 2b3af27

Browse files
connortsui20connortsui20
committed
Merge branch 'master' into rwlock-downgrade
2 parents 3c33838 + 2cbbe8b commit 2b3af27

File tree

798 files changed

+12168
-8885
lines changed

Some content is hidden

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

798 files changed

+12168
-8885
lines changed

‎.mailmap

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Nick Platt <[email protected]>
435435
Niclas Schwarzlose <[email protected]>
436436
Nicolas Abram <[email protected]>
437437
Nicole Mazzuca <[email protected]>
438-
Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> nils <[email protected]>
438+
Noratrieb <48135649+Noratrieb@users.noreply.github.com> <[email protected]>
439439
Nif Ward <[email protected]>
440440
Nika Layzell <[email protected]> <[email protected]>
441441
NODA Kai <[email protected]>

‎Cargo.lock

+45-52
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
573573

574574
[[package]]
575575
name = "clippy"
576-
version = "0.1.81"
576+
version = "0.1.82"
577577
dependencies = [
578578
"anstream",
579579
"clippy_config",
@@ -594,13 +594,13 @@ dependencies = [
594594
"termize",
595595
"tokio",
596596
"toml 0.7.8",
597-
"ui_test 0.23.0",
597+
"ui_test 0.24.0",
598598
"walkdir",
599599
]
600600

601601
[[package]]
602602
name = "clippy_config"
603-
version = "0.1.81"
603+
version = "0.1.82"
604604
dependencies = [
605605
"rustc-semver",
606606
"serde",
@@ -623,7 +623,7 @@ dependencies = [
623623

624624
[[package]]
625625
name = "clippy_lints"
626-
version = "0.1.81"
626+
version = "0.1.82"
627627
dependencies = [
628628
"arrayvec",
629629
"cargo_metadata 0.18.1",
@@ -648,7 +648,7 @@ dependencies = [
648648

649649
[[package]]
650650
name = "clippy_utils"
651-
version = "0.1.81"
651+
version = "0.1.82"
652652
dependencies = [
653653
"arrayvec",
654654
"clippy_config",
@@ -969,7 +969,7 @@ dependencies = [
969969

970970
[[package]]
971971
name = "declare_clippy_lint"
972-
version = "0.1.81"
972+
version = "0.1.82"
973973
dependencies = [
974974
"itertools",
975975
"quote",
@@ -2571,18 +2571,6 @@ dependencies = [
25712571
"indexmap",
25722572
"memchr",
25732573
"ruzstd 0.5.0",
2574-
"wasmparser 0.118.2",
2575-
]
2576-
2577-
[[package]]
2578-
name = "object"
2579-
version = "0.34.0"
2580-
source = "registry+https://github.com/rust-lang/crates.io-index"
2581-
checksum = "d7090bae93f8585aad99e595b7073c5de9ba89fbd6b4e9f0cdd7a10177273ac8"
2582-
dependencies = [
2583-
"flate2",
2584-
"memchr",
2585-
"ruzstd 0.6.0",
25862574
]
25872575

25882576
[[package]]
@@ -2596,14 +2584,20 @@ dependencies = [
25962584

25972585
[[package]]
25982586
name = "object"
2599-
version = "0.36.0"
2587+
version = "0.36.2"
26002588
source = "registry+https://github.com/rust-lang/crates.io-index"
2601-
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
2589+
checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
26022590
dependencies = [
26032591
"compiler_builtins",
2592+
"crc32fast",
2593+
"flate2",
2594+
"hashbrown",
2595+
"indexmap",
26042596
"memchr",
26052597
"rustc-std-workspace-alloc",
26062598
"rustc-std-workspace-core",
2599+
"ruzstd 0.7.0",
2600+
"wasmparser 0.214.0",
26072601
]
26082602

26092603
[[package]]
@@ -2977,6 +2971,16 @@ dependencies = [
29772971
"pad",
29782972
]
29792973

2974+
[[package]]
2975+
name = "prettydiff"
2976+
version = "0.7.0"
2977+
source = "registry+https://github.com/rust-lang/crates.io-index"
2978+
checksum = "abec3fb083c10660b3854367697da94c674e9e82aa7511014dc958beeb7215e9"
2979+
dependencies = [
2980+
"owo-colors",
2981+
"pad",
2982+
]
2983+
29802984
[[package]]
29812985
name = "proc-macro-hack"
29822986
version = "0.5.20+deprecated"
@@ -3334,10 +3338,10 @@ dependencies = [
33343338
"bstr",
33353339
"build_helper",
33363340
"gimli 0.31.0",
3337-
"object 0.34.0",
3341+
"object 0.36.2",
33383342
"regex",
33393343
"similar",
3340-
"wasmparser 0.118.2",
3344+
"wasmparser 0.214.0",
33413345
]
33423346

33433347
[[package]]
@@ -3643,7 +3647,7 @@ dependencies = [
36433647
"itertools",
36443648
"libc",
36453649
"measureme",
3646-
"object 0.32.2",
3650+
"object 0.36.2",
36473651
"rustc-demangle",
36483652
"rustc_ast",
36493653
"rustc_attr",
@@ -3682,7 +3686,7 @@ dependencies = [
36823686
"itertools",
36833687
"jobserver",
36843688
"libc",
3685-
"object 0.32.2",
3689+
"object 0.36.2",
36863690
"pathdiff",
36873691
"regex",
36883692
"rustc_arena",
@@ -3712,7 +3716,7 @@ dependencies = [
37123716
"thin-vec",
37133717
"thorin-dwp",
37143718
"tracing",
3715-
"wasm-encoder 0.200.0",
3719+
"wasm-encoder 0.210.0",
37163720
"windows",
37173721
]
37183722

@@ -4665,7 +4669,7 @@ name = "rustc_target"
46654669
version = "0.0.0"
46664670
dependencies = [
46674671
"bitflags 2.5.0",
4668-
"object 0.32.2",
4672+
"object 0.36.2",
46694673
"rustc_abi",
46704674
"rustc_data_structures",
46714675
"rustc_feature",
@@ -4950,12 +4954,11 @@ dependencies = [
49504954

49514955
[[package]]
49524956
name = "ruzstd"
4953-
version = "0.6.0"
4957+
version = "0.7.0"
49544958
source = "registry+https://github.com/rust-lang/crates.io-index"
4955-
checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
4959+
checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
49564960
dependencies = [
49574961
"byteorder",
4958-
"derive_more",
49594962
"twox-hash",
49604963
]
49614964

@@ -5242,7 +5245,7 @@ dependencies = [
52425245
"hermit-abi 0.4.0",
52435246
"libc",
52445247
"miniz_oxide",
5245-
"object 0.36.0",
5248+
"object 0.36.2",
52465249
"panic_abort",
52475250
"panic_unwind",
52485251
"profiler_builtins",
@@ -5825,7 +5828,7 @@ dependencies = [
58255828
"indicatif",
58265829
"lazy_static",
58275830
"levenshtein",
5828-
"prettydiff",
5831+
"prettydiff 0.6.4",
58295832
"regex",
58305833
"rustc_version",
58315834
"rustfix 0.6.1",
@@ -5836,9 +5839,9 @@ dependencies = [
58365839

58375840
[[package]]
58385841
name = "ui_test"
5839-
version = "0.23.0"
5842+
version = "0.24.0"
58405843
source = "registry+https://github.com/rust-lang/crates.io-index"
5841-
checksum = "29e5f4ffcbab82453958fbf59990e981b8e8a177dcd60c2bd8f9b52c3036a6e1"
5844+
checksum = "bc1c6c78d55482388711c8d417b8e547263046a607512278fed274c54633bbe4"
58425845
dependencies = [
58435846
"annotate-snippets 0.11.4",
58445847
"anyhow",
@@ -5852,14 +5855,13 @@ dependencies = [
58525855
"indicatif",
58535856
"lazy_static",
58545857
"levenshtein",
5855-
"prettydiff",
5858+
"prettydiff 0.7.0",
58565859
"regex",
58575860
"rustc_version",
58585861
"rustfix 0.8.1",
58595862
"serde",
58605863
"serde_json",
58615864
"spanned",
5862-
"tempfile",
58635865
]
58645866

58655867
[[package]]
@@ -6179,15 +6181,6 @@ dependencies = [
61796181
"wasm-component-ld",
61806182
]
61816183

6182-
[[package]]
6183-
name = "wasm-encoder"
6184-
version = "0.200.0"
6185-
source = "registry+https://github.com/rust-lang/crates.io-index"
6186-
checksum = "b9e3fb0c8fbddd78aa6095b850dfeedbc7506cf5f81e633f69cf8f2333ab84b9"
6187-
dependencies = [
6188-
"leb128",
6189-
]
6190-
61916184
[[package]]
61926185
name = "wasm-encoder"
61936186
version = "0.210.0"
@@ -6224,26 +6217,26 @@ dependencies = [
62246217

62256218
[[package]]
62266219
name = "wasmparser"
6227-
version = "0.118.2"
6220+
version = "0.210.0"
62286221
source = "registry+https://github.com/rust-lang/crates.io-index"
6229-
checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c"
6222+
checksum = "a7bbcd21e7581619d9f6ca00f8c4f08f1cacfe58bf63f83af57cd0476f1026f5"
62306223
dependencies = [
6224+
"ahash",
6225+
"bitflags 2.5.0",
6226+
"hashbrown",
62316227
"indexmap",
62326228
"semver",
6229+
"serde",
62336230
]
62346231

62356232
[[package]]
62366233
name = "wasmparser"
6237-
version = "0.210.0"
6234+
version = "0.214.0"
62386235
source = "registry+https://github.com/rust-lang/crates.io-index"
6239-
checksum = "a7bbcd21e7581619d9f6ca00f8c4f08f1cacfe58bf63f83af57cd0476f1026f5"
6236+
checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
62406237
dependencies = [
6241-
"ahash",
62426238
"bitflags 2.5.0",
6243-
"hashbrown",
62446239
"indexmap",
6245-
"semver",
6246-
"serde",
62476240
]
62486241

62496242
[[package]]

‎compiler/rustc_ast/src/ast.rs

+5
Original file line numberDiff line numberDiff line change
@@ -2266,6 +2266,11 @@ bitflags::bitflags! {
22662266
}
22672267

22682268
impl InlineAsmOptions {
2269+
pub const COUNT: usize = Self::all().bits().count_ones() as usize;
2270+
2271+
pub const GLOBAL_OPTIONS: Self = Self::ATT_SYNTAX.union(Self::RAW);
2272+
pub const NAKED_OPTIONS: Self = Self::ATT_SYNTAX.union(Self::RAW).union(Self::NORETURN);
2273+
22692274
pub fn human_readable_names(&self) -> Vec<&'static str> {
22702275
let mut options = vec![];
22712276

‎compiler/rustc_ast_lowering/src/item.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
172172
id: NodeId,
173173
hir_id: hir::HirId,
174174
ident: &mut Ident,
175-
attrs: Option<&'hir [Attribute]>,
175+
attrs: &'hir [Attribute],
176176
vis_span: Span,
177177
i: &ItemKind,
178178
) -> hir::ItemKind<'hir> {
@@ -488,7 +488,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
488488
id: NodeId,
489489
vis_span: Span,
490490
ident: &mut Ident,
491-
attrs: Option<&'hir [Attribute]>,
491+
attrs: &'hir [Attribute],
492492
) -> hir::ItemKind<'hir> {
493493
let path = &tree.prefix;
494494
let segments = prefix.segments.iter().chain(path.segments.iter()).cloned().collect();
@@ -566,7 +566,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
566566
// `ItemLocalId` and the new owner. (See `lower_node_id`)
567567
let kind =
568568
this.lower_use_tree(use_tree, &prefix, id, vis_span, &mut ident, attrs);
569-
if let Some(attrs) = attrs {
569+
if !attrs.is_empty() {
570570
this.attrs.insert(hir::ItemLocalId::ZERO, attrs);
571571
}
572572

@@ -1525,8 +1525,14 @@ impl<'hir> LoweringContext<'_, 'hir> {
15251525
continue;
15261526
}
15271527
let is_param = *is_param.get_or_insert_with(compute_is_param);
1528-
if !is_param {
1529-
self.dcx().emit_err(MisplacedRelaxTraitBound { span: bound.span() });
1528+
if !is_param && !self.tcx.features().more_maybe_bounds {
1529+
self.tcx
1530+
.sess
1531+
.create_feature_err(
1532+
MisplacedRelaxTraitBound { span: bound.span() },
1533+
sym::more_maybe_bounds,
1534+
)
1535+
.emit();
15301536
}
15311537
}
15321538
}

0 commit comments

Comments
 (0)