Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 383b9c4

Browse files
committed
Auto merge of #144869 - samueltardieu:rollup-3ba3m47, r=samueltardieu
Rollup of 12 pull requests Successful merges: - #142678 (Misc cleanups of `generic_arg_infer` related HIR logic) - #144070 (Implement `hash_map` macro ) - #144738 (Remove the omit_gdb_pretty_printer_section attribute) - #144790 (Multiple bounds checking elision failures) - #144805 (compiletest: Preliminary cleanup of `ProcRes` printing/unwinding) - #144808 (`Interner` arg to `EarlyBinder` does not affect auto traits) - #144816 (Update E0562 to account for the new impl trait positions) - #144822 (Return a struct with named fields from `hash_owner_nodes`) - #144824 (Updated test links in compiler) - #144829 (Use full flag name in strip command for Darwin) - #144843 (Weekly `cargo update`) - #144851 (Forbid tail calling intrinsics) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f34ba77 + 018c172 commit 383b9c4

File tree

143 files changed

+533
-556
lines changed

Some content is hidden

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

143 files changed

+533
-556
lines changed

‎Cargo.lock‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,9 @@ dependencies = [
518518

519519
[[package]]
520520
name = "clap"
521-
version = "4.5.41"
521+
version = "4.5.42"
522522
source = "registry+https://github.com/rust-lang/crates.io-index"
523-
checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
523+
checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
524524
dependencies = [
525525
"clap_builder",
526526
"clap_derive",
@@ -538,9 +538,9 @@ dependencies = [
538538

539539
[[package]]
540540
name = "clap_builder"
541-
version = "4.5.41"
541+
version = "4.5.42"
542542
source = "registry+https://github.com/rust-lang/crates.io-index"
543-
checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
543+
checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
544544
dependencies = [
545545
"anstream",
546546
"anstyle",
@@ -1171,7 +1171,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
11711171
dependencies = [
11721172
"libc",
11731173
"option-ext",
1174-
"redox_users 0.5.0",
1174+
"redox_users 0.5.2",
11751175
"windows-sys 0.60.2",
11761176
]
11771177

@@ -2094,9 +2094,9 @@ dependencies = [
20942094

20952095
[[package]]
20962096
name = "jsonpath-rust"
2097-
version = "1.0.3"
2097+
version = "1.0.4"
20982098
source = "registry+https://github.com/rust-lang/crates.io-index"
2099-
checksum = "7d057f8fd19e20c3f14d3663983397155739b6bc1148dc5cd4c4a1a5b3130eb0"
2099+
checksum = "633a7320c4bb672863a3782e89b9094ad70285e097ff6832cddd0ec615beadfa"
21002100
dependencies = [
21012101
"pest",
21022102
"pest_derive",
@@ -2190,7 +2190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
21902190
checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
21912191
dependencies = [
21922192
"cfg-if",
2193-
"windows-targets 0.53.2",
2193+
"windows-targets 0.53.3",
21942194
]
21952195

21962196
[[package]]
@@ -2201,9 +2201,9 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
22012201

22022202
[[package]]
22032203
name = "libredox"
2204-
version = "0.1.6"
2204+
version = "0.1.9"
22052205
source = "registry+https://github.com/rust-lang/crates.io-index"
2206-
checksum = "4488594b9328dee448adb906d8b126d9b7deb7cf5c22161ee591610bb1be83c0"
2206+
checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
22072207
dependencies = [
22082208
"bitflags",
22092209
"libc",
@@ -2643,17 +2643,17 @@ dependencies = [
26432643

26442644
[[package]]
26452645
name = "object"
2646-
version = "0.37.1"
2646+
version = "0.37.2"
26472647
source = "registry+https://github.com/rust-lang/crates.io-index"
2648-
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
2648+
checksum = "b3e3d0a7419f081f4a808147e845310313a39f322d7ae1f996b7f001d6cbed04"
26492649
dependencies = [
26502650
"crc32fast",
26512651
"flate2",
26522652
"hashbrown",
26532653
"indexmap",
26542654
"memchr",
26552655
"ruzstd 0.8.1",
2656-
"wasmparser 0.234.0",
2656+
"wasmparser 0.236.0",
26572657
]
26582658

26592659
[[package]]
@@ -3167,9 +3167,9 @@ dependencies = [
31673167

31683168
[[package]]
31693169
name = "redox_syscall"
3170-
version = "0.5.16"
3170+
version = "0.5.17"
31713171
source = "registry+https://github.com/rust-lang/crates.io-index"
3172-
checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
3172+
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
31733173
dependencies = [
31743174
"bitflags",
31753175
]
@@ -3187,9 +3187,9 @@ dependencies = [
31873187

31883188
[[package]]
31893189
name = "redox_users"
3190-
version = "0.5.0"
3190+
version = "0.5.2"
31913191
source = "registry+https://github.com/rust-lang/crates.io-index"
3192-
checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
3192+
checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
31933193
dependencies = [
31943194
"getrandom 0.2.16",
31953195
"libredox",
@@ -3279,7 +3279,7 @@ dependencies = [
32793279
"build_helper",
32803280
"gimli 0.32.0",
32813281
"libc",
3282-
"object 0.37.1",
3282+
"object 0.37.2",
32833283
"regex",
32843284
"serde_json",
32853285
"similar",
@@ -3301,9 +3301,9 @@ dependencies = [
33013301

33023302
[[package]]
33033303
name = "rustc-demangle"
3304-
version = "0.1.25"
3304+
version = "0.1.26"
33053305
source = "registry+https://github.com/rust-lang/crates.io-index"
3306-
checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
3306+
checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
33073307

33083308
[[package]]
33093309
name = "rustc-hash"
@@ -3569,7 +3569,7 @@ dependencies = [
35693569
"itertools",
35703570
"libc",
35713571
"measureme",
3572-
"object 0.37.1",
3572+
"object 0.37.2",
35733573
"rustc-demangle",
35743574
"rustc_abi",
35753575
"rustc_ast",
@@ -3607,7 +3607,7 @@ dependencies = [
36073607
"cc",
36083608
"itertools",
36093609
"libc",
3610-
"object 0.37.1",
3610+
"object 0.37.2",
36113611
"pathdiff",
36123612
"regex",
36133613
"rustc_abi",
@@ -4642,7 +4642,7 @@ name = "rustc_target"
46424642
version = "0.0.0"
46434643
dependencies = [
46444644
"bitflags",
4645-
"object 0.37.1",
4645+
"object 0.37.2",
46464646
"rustc_abi",
46474647
"rustc_data_structures",
46484648
"rustc_fs_util",
@@ -5039,9 +5039,9 @@ dependencies = [
50395039

50405040
[[package]]
50415041
name = "serde_json"
5042-
version = "1.0.141"
5042+
version = "1.0.142"
50435043
source = "registry+https://github.com/rust-lang/crates.io-index"
5044-
checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
5044+
checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
50455045
dependencies = [
50465046
"itoa",
50475047
"memchr",
@@ -6099,12 +6099,12 @@ dependencies = [
60996099

61006100
[[package]]
61016101
name = "wasm-encoder"
6102-
version = "0.235.0"
6102+
version = "0.236.0"
61036103
source = "registry+https://github.com/rust-lang/crates.io-index"
6104-
checksum = "b3bc393c395cb621367ff02d854179882b9a351b4e0c93d1397e6090b53a5c2a"
6104+
checksum = "3108979166ab0d3c7262d2e16a2190ffe784b2a5beb963edef154b5e8e07680b"
61056105
dependencies = [
61066106
"leb128fmt",
6107-
"wasmparser 0.235.0",
6107+
"wasmparser 0.236.0",
61086108
]
61096109

61106110
[[package]]
@@ -6144,9 +6144,9 @@ dependencies = [
61446144

61456145
[[package]]
61466146
name = "wasmparser"
6147-
version = "0.235.0"
6147+
version = "0.236.0"
61486148
source = "registry+https://github.com/rust-lang/crates.io-index"
6149-
checksum = "161296c618fa2d63f6ed5fffd1112937e803cb9ec71b32b01a76321555660917"
6149+
checksum = "16d1eee846a705f6f3cb9d7b9f79b54583810f1fb57a1e3aea76d1742db2e3d2"
61506150
dependencies = [
61516151
"bitflags",
61526152
"indexmap",
@@ -6155,22 +6155,22 @@ dependencies = [
61556155

61566156
[[package]]
61576157
name = "wast"
6158-
version = "235.0.0"
6158+
version = "236.0.0"
61596159
source = "registry+https://github.com/rust-lang/crates.io-index"
6160-
checksum = "1eda4293f626c99021bb3a6fbe4fbbe90c0e31a5ace89b5f620af8925de72e13"
6160+
checksum = "11d6b6faeab519ba6fbf9b26add41617ca6f5553f99ebc33d876e591d2f4f3c6"
61616161
dependencies = [
61626162
"bumpalo",
61636163
"leb128fmt",
61646164
"memchr",
61656165
"unicode-width 0.2.1",
6166-
"wasm-encoder 0.235.0",
6166+
"wasm-encoder 0.236.0",
61676167
]
61686168

61696169
[[package]]
61706170
name = "wat"
6171-
version = "1.235.0"
6171+
version = "1.236.0"
61726172
source = "registry+https://github.com/rust-lang/crates.io-index"
6173-
checksum = "e777e0327115793cb96ab220b98f85327ec3d11f34ec9e8d723264522ef206aa"
6173+
checksum = "cc31704322400f461f7f31a5f9190d5488aaeafb63ae69ad2b5888d2704dcb08"
61746174
dependencies = [
61756175
"wast",
61766176
]
@@ -6426,7 +6426,7 @@ version = "0.60.2"
64266426
source = "registry+https://github.com/rust-lang/crates.io-index"
64276427
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
64286428
dependencies = [
6429-
"windows-targets 0.53.2",
6429+
"windows-targets 0.53.3",
64306430
]
64316431

64326432
[[package]]
@@ -6462,10 +6462,11 @@ dependencies = [
64626462

64636463
[[package]]
64646464
name = "windows-targets"
6465-
version = "0.53.2"
6465+
version = "0.53.3"
64666466
source = "registry+https://github.com/rust-lang/crates.io-index"
6467-
checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
6467+
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
64686468
dependencies = [
6469+
"windows-link",
64696470
"windows_aarch64_gnullvm 0.53.0",
64706471
"windows_aarch64_msvc 0.53.0",
64716472
"windows_i686_gnu 0.53.0",

‎compiler/rustc_ast_lowering/src/index.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
311311
);
312312

313313
self.with_parent(const_arg.hir_id, |this| {
314-
intravisit::walk_ambig_const_arg(this, const_arg);
314+
intravisit::walk_const_arg(this, const_arg);
315315
});
316316
}
317317

‎compiler/rustc_ast_lowering/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
675675
let bodies = SortedMap::from_presorted_elements(bodies);
676676

677677
// Don't hash unless necessary, because it's expensive.
678-
let (opt_hash_including_bodies, attrs_hash, delayed_lints_hash) =
678+
let rustc_middle::hir::Hashes{opt_hash_including_bodies, attrs_hash, delayed_lints_hash} =
679679
self.tcx.hash_owner_nodes(node, &bodies, &attrs, &delayed_lints, define_opaque);
680680
let num_nodes = self.item_local_id_counter.as_usize();
681681
let (nodes, parenting) = index::index_hir(self.tcx, node, &bodies, num_nodes);

‎compiler/rustc_attr_parsing/src/attributes/codegen_attrs.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,3 @@ impl<S: Stage> CombineAttributeParser<S> for TargetFeatureParser {
374374
features
375375
}
376376
}
377-
378-
pub(crate) struct OmitGdbPrettyPrinterSectionParser;
379-
380-
impl<S: Stage> NoArgsAttributeParser<S> for OmitGdbPrettyPrinterSectionParser {
381-
const PATH: &[Symbol] = &[sym::omit_gdb_pretty_printer_section];
382-
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Error;
383-
const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::OmitGdbPrettyPrinterSection;
384-
}

‎compiler/rustc_attr_parsing/src/context.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ use crate::attributes::allow_unstable::{
1717
AllowConstFnUnstableParser, AllowInternalUnstableParser, UnstableFeatureBoundParser,
1818
};
1919
use crate::attributes::codegen_attrs::{
20-
ColdParser, CoverageParser, ExportNameParser, NakedParser, NoMangleParser,
21-
OmitGdbPrettyPrinterSectionParser, OptimizeParser, TargetFeatureParser, TrackCallerParser,
22-
UsedParser,
20+
ColdParser, CoverageParser, ExportNameParser, NakedParser, NoMangleParser, OptimizeParser,
21+
TargetFeatureParser, TrackCallerParser, UsedParser,
2322
};
2423
use crate::attributes::confusables::ConfusablesParser;
2524
use crate::attributes::deprecation::DeprecationParser;
@@ -198,7 +197,6 @@ attribute_parsers!(
198197
Single<WithoutArgs<NoImplicitPreludeParser>>,
199198
Single<WithoutArgs<NoMangleParser>>,
200199
Single<WithoutArgs<NonExhaustiveParser>>,
201-
Single<WithoutArgs<OmitGdbPrettyPrinterSectionParser>>,
202200
Single<WithoutArgs<ParenSugarParser>>,
203201
Single<WithoutArgs<PassByValueParser>>,
204202
Single<WithoutArgs<PointeeParser>>,

‎compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
use rustc_codegen_ssa::base::collect_debugger_visualizers_transitive;
44
use rustc_codegen_ssa::traits::*;
5-
use rustc_hir::attrs::AttributeKind;
65
use rustc_hir::def_id::LOCAL_CRATE;
7-
use rustc_hir::find_attr;
86
use rustc_middle::bug;
97
use rustc_middle::middle::debugger_visualizer::DebuggerVisualizerType;
108
use rustc_session::config::{CrateType, DebugInfo};
@@ -86,9 +84,6 @@ pub(crate) fn get_or_insert_gdb_debug_scripts_section_global<'ll>(
8684
}
8785

8886
pub(crate) fn needs_gdb_debug_scripts_section(cx: &CodegenCx<'_, '_>) -> bool {
89-
let omit_gdb_pretty_printer_section =
90-
find_attr!(cx.tcx.hir_krate_attrs(), AttributeKind::OmitGdbPrettyPrinterSection);
91-
9287
// To ensure the section `__rustc_debug_gdb_scripts_section__` will not create
9388
// ODR violations at link time, this section will not be emitted for rlibs since
9489
// each rlib could produce a different set of visualizers that would be embedded
@@ -117,8 +112,7 @@ pub(crate) fn needs_gdb_debug_scripts_section(cx: &CodegenCx<'_, '_>) -> bool {
117112
}
118113
});
119114

120-
!omit_gdb_pretty_printer_section
121-
&& cx.sess().opts.debuginfo != DebugInfo::None
115+
cx.sess().opts.debuginfo != DebugInfo::None
122116
&& cx.sess().target.emit_debug_gdb_scripts
123117
&& embed_visualizers
124118
}

‎compiler/rustc_codegen_ssa/src/back/link.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,11 +1011,12 @@ fn link_natively(
10111011
(Strip::Debuginfo, _) => {
10121012
strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-debug"])
10131013
}
1014-
// Per the manpage, `-x` is the maximum safe strip level for dynamic libraries. (#93988)
1014+
1015+
// Per the manpage, --discard-all is the maximum safe strip level for dynamic libraries. (#93988)
10151016
(
10161017
Strip::Symbols,
10171018
CrateType::Dylib | CrateType::Cdylib | CrateType::ProcMacro | CrateType::Sdylib,
1018-
) => strip_with_external_utility(sess, stripcmd, out_filename, &["-x"]),
1019+
) => strip_with_external_utility(sess, stripcmd, out_filename, &["--discard-all"]),
10191020
(Strip::Symbols, _) => {
10201021
strip_with_external_utility(sess, stripcmd, out_filename, &["--strip-all"])
10211022
}

‎compiler/rustc_error_codes/src/error_codes/E0562.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Abstract return types (written `impl Trait` for some trait `Trait`) are only
2-
allowed as function and inherent impl return types.
1+
`impl Trait` is only allowed as a function return and argument type.
32

43
Erroneous code example:
54

@@ -14,7 +13,7 @@ fn main() {
1413
}
1514
```
1615

17-
Make sure `impl Trait` only appears in return-type position.
16+
Make sure `impl Trait` appears in a function signature.
1817

1918
```
2019
fn count_to_n(n: usize) -> impl Iterator<Item=usize> {
@@ -28,6 +27,6 @@ fn main() {
2827
}
2928
```
3029

31-
See [RFC 1522] for more details.
30+
See the [reference] for more details on `impl Trait`.
3231

33-
[RFC 1522]: https://github.com/rust-lang/rfcs/blob/master/text/1522-conservative-impl-trait.md
32+
[reference]: https://doc.rust-lang.org/stable/reference/types/impl-trait.html

‎compiler/rustc_feature/src/builtin_attrs.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,11 +1257,6 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
12571257
TEST, rustc_dummy, Normal, template!(Word /* doesn't matter*/),
12581258
DuplicatesOk, EncodeCrossCrate::No
12591259
),
1260-
gated!(
1261-
omit_gdb_pretty_printer_section, Normal, template!(Word),
1262-
WarnFollowing, EncodeCrossCrate::No,
1263-
"the `#[omit_gdb_pretty_printer_section]` attribute is just used for the Rust test suite",
1264-
),
12651260
rustc_attr!(
12661261
TEST, pattern_complexity_limit, CrateLevel, template!(NameValueStr: "N"),
12671262
ErrorFollowing, EncodeCrossCrate::No,

‎compiler/rustc_feature/src/removed.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ declare_features! (
199199
/// Renamed to `dyn_compatible_for_dispatch`.
200200
(removed, object_safe_for_dispatch, "1.83.0", Some(43561),
201201
Some("renamed to `dyn_compatible_for_dispatch`"), 131511),
202+
/// Allows using `#[omit_gdb_pretty_printer_section]`.
203+
(removed, omit_gdb_pretty_printer_section, "CURRENT_RUSTC_VERSION", None, None, 144738),
202204
/// Allows using `#[on_unimplemented(..)]` on traits.
203205
/// (Moved to `rustc_attrs`.)
204206
(removed, on_unimplemented, "1.40.0", None, None, 65794),

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /