Skip to content

Commit 87293c9

Browse files
borsbors
committed
Auto merge of rust-lang#124910 - matthiaskrgr:rollup-lo1uvdn, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#123344 (Remove braces when fixing a nested use tree into a single item) - rust-lang#124587 (Generic `NonZero` post-stabilization changes.) - rust-lang#124775 (crashes: add lastest batch of crash tests) - rust-lang#124869 (Make sure we don't deny macro vars w keyword names) - rust-lang#124876 (Simplify `use crate::rustc_foo::bar` occurrences.) - rust-lang#124892 (Update cc crate to v1.0.97) - rust-lang#124903 (Ignore empty RUSTC_WRAPPER in bootstrap) - rust-lang#124909 (Reapply the part of rust-lang#124548 that bors forgot) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ec1b698 + 782ef18 commit 87293c9

File tree

86 files changed

+850
-579
lines changed

Some content is hidden

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

86 files changed

+850
-579
lines changed

‎Cargo.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,9 @@ version = "0.1.0"
479479

480480
[[package]]
481481
name = "cc"
482-
version = "1.0.92"
482+
version = "1.0.97"
483483
source = "registry+https://github.com/rust-lang/crates.io-index"
484-
checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41"
484+
checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
485485

486486
[[package]]
487487
name = "cfg-if"
@@ -2219,7 +2219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
22192219
checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
22202220
dependencies = [
22212221
"cfg-if",
2222-
"windows-targets 0.48.5",
2222+
"windows-targets 0.52.4",
22232223
]
22242224

22252225
[[package]]

‎compiler/rustc_abi/src/layout.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::borrow::{Borrow, Cow};
22
use std::cmp;
33
use std::fmt::{self, Write};
44
use std::iter;
5+
use std::num::NonZero;
56
use std::ops::Bound;
67
use std::ops::Deref;
78

@@ -10,8 +11,8 @@ use tracing::debug;
1011

1112
use crate::{
1213
Abi, AbiAndPrefAlign, Align, FieldsShape, IndexSlice, IndexVec, Integer, LayoutS, Niche,
13-
NonZeroUsize, Primitive, ReprOptions, Scalar, Size, StructKind, TagEncoding, TargetDataLayout,
14-
Variants, WrappingRange,
14+
Primitive, ReprOptions, Scalar, Size, StructKind, TagEncoding, TargetDataLayout, Variants,
15+
WrappingRange,
1516
};
1617

1718
// A variant is absent if it's uninhabited and only has ZST fields.
@@ -327,7 +328,7 @@ pub trait LayoutCalculator {
327328

328329
Some(LayoutS {
329330
variants: Variants::Single { index: VariantIdx::new(0) },
330-
fields: FieldsShape::Union(NonZeroUsize::new(only_variant.len())?),
331+
fields: FieldsShape::Union(NonZero::new(only_variant.len())?),
331332
abi,
332333
largest_niche: None,
333334
align,

‎compiler/rustc_abi/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#![cfg_attr(feature = "nightly", feature(rustdoc_internals))]
55

66
use std::fmt;
7-
use std::num::{NonZeroUsize, ParseIntError};
7+
use std::num::{NonZero, ParseIntError};
88
use std::ops::{Add, AddAssign, Mul, RangeInclusive, Sub};
99
use std::str::FromStr;
1010

@@ -1149,7 +1149,7 @@ pub enum FieldsShape<FieldIdx: Idx> {
11491149
Primitive,
11501150

11511151
/// All fields start at no offset. The `usize` is the field count.
1152-
Union(NonZeroUsize),
1152+
Union(NonZero<usize>),
11531153

11541154
/// Array/vector-like placement, with all fields of identical types.
11551155
Array { stride: Size, count: u64 },

‎compiler/rustc_ast/src/ast.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2164,7 +2164,7 @@ pub enum TyKind {
21642164
MacCall(P<MacCall>),
21652165
/// Placeholder for a `va_list`.
21662166
CVarArgs,
2167-
/// Pattern types like `pattern_type!(u32 is 1..=)`, which is the same as `NonZeroU32`,
2167+
/// Pattern types like `pattern_type!(u32 is 1..=)`, which is the same as `NonZero<u32>`,
21682168
/// just as part of the type system.
21692169
Pat(P<Ty>, P<Pat>),
21702170
/// Sometimes we need a dummy value when no error has occurred.
@@ -2729,7 +2729,7 @@ pub enum UseTreeKind {
27292729
/// `use prefix` or `use prefix as rename`
27302730
Simple(Option<Ident>),
27312731
/// `use prefix::{...}`
2732-
Nested(ThinVec<(UseTree, NodeId)>),
2732+
Nested { items: ThinVec<(UseTree, NodeId)>, span: Span },
27332733
/// `use prefix::*`
27342734
Glob,
27352735
}

‎compiler/rustc_ast/src/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ fn noop_visit_use_tree<T: MutVisitor>(use_tree: &mut UseTree, vis: &mut T) {
441441
vis.visit_path(prefix);
442442
match kind {
443443
UseTreeKind::Simple(rename) => visit_opt(rename, |rename| vis.visit_ident(rename)),
444-
UseTreeKind::Nested(items) => {
444+
UseTreeKind::Nested { items, .. } => {
445445
for (tree, id) in items {
446446
vis.visit_use_tree(tree);
447447
vis.visit_id(id);

‎compiler/rustc_ast/src/visit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ pub fn walk_use_tree<'a, V: Visitor<'a>>(
517517
visit_opt!(visitor, visit_ident, rename);
518518
}
519519
UseTreeKind::Glob => {}
520-
UseTreeKind::Nested(ref use_trees) => {
521-
for &(ref nested_tree, nested_id) in use_trees {
520+
UseTreeKind::Nested { ref items, .. } => {
521+
for &(ref nested_tree, nested_id) in items {
522522
try_visit!(visitor.visit_use_tree(nested_tree, nested_id, true));
523523
}
524524
}

‎compiler/rustc_ast_lowering/src/item.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ impl<'hir> LoweringContext<'_, 'hir> {
135135

136136
fn lower_item_id_use_tree(&mut self, tree: &UseTree, vec: &mut SmallVec<[hir::ItemId; 1]>) {
137137
match &tree.kind {
138-
UseTreeKind::Nested(nested_vec) => {
139-
for &(ref nested, id) in nested_vec {
138+
UseTreeKind::Nested { items, .. } => {
139+
for &(ref nested, id) in items {
140140
vec.push(hir::ItemId {
141141
owner_id: hir::OwnerId { def_id: self.local_def_id(id) },
142142
});
@@ -518,7 +518,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
518518
let path = self.lower_use_path(res, &path, ParamMode::Explicit);
519519
hir::ItemKind::Use(path, hir::UseKind::Glob)
520520
}
521-
UseTreeKind::Nested(ref trees) => {
521+
UseTreeKind::Nested { items: ref trees, .. } => {
522522
// Nested imports are desugared into simple imports.
523523
// So, if we start with
524524
//

‎compiler/rustc_ast_pretty/src/pprust/state/item.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ impl<'a> State<'a> {
715715
}
716716
self.word("*");
717717
}
718-
ast::UseTreeKind::Nested(items) => {
718+
ast::UseTreeKind::Nested { items, .. } => {
719719
if !tree.prefix.segments.is_empty() {
720720
self.print_path(&tree.prefix, false, 0);
721721
self.word("::");
@@ -734,7 +734,7 @@ impl<'a> State<'a> {
734734
self.print_use_tree(&use_tree.0);
735735
if !is_last {
736736
self.word(",");
737-
if let ast::UseTreeKind::Nested(_) = use_tree.0.kind {
737+
if let ast::UseTreeKind::Nested { .. } = use_tree.0.kind {
738738
self.hardbreak();
739739
} else {
740740
self.space();

‎compiler/rustc_builtin_macros/src/assert/context.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,13 @@ impl<'cx, 'a> Context<'cx, 'a> {
120120
thin_vec![self.cx.attr_nested_word(sym::allow, sym::unused_imports, self.span)],
121121
ItemKind::Use(UseTree {
122122
prefix: self.cx.path(self.span, self.cx.std_path(&[sym::asserting])),
123-
kind: UseTreeKind::Nested(thin_vec![
124-
nested_tree(self, sym::TryCaptureGeneric),
125-
nested_tree(self, sym::TryCapturePrintable),
126-
]),
123+
kind: UseTreeKind::Nested {
124+
items: thin_vec![
125+
nested_tree(self, sym::TryCaptureGeneric),
126+
nested_tree(self, sym::TryCapturePrintable),
127+
],
128+
span: self.span,
129+
},
127130
span: self.span,
128131
}),
129132
),

‎compiler/rustc_codegen_gcc/src/debuginfo.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
use crate::rustc_index::Idx;
21
use gccjit::{Location, RValue};
32
use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext, VariableKind};
43
use rustc_codegen_ssa::traits::{DebugInfoBuilderMethods, DebugInfoMethods};
54
use rustc_data_structures::sync::Lrc;
65
use rustc_index::bit_set::BitSet;
7-
use rustc_index::IndexVec;
6+
use rustc_index::{Idx, IndexVec};
87
use rustc_middle::mir::{self, Body, SourceScope};
98
use rustc_middle::ty::{Instance, PolyExistentialTraitRef, Ty};
109
use rustc_session::config::DebugInfo;

‎compiler/rustc_codegen_gcc/src/type_of.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::fmt::Write;
22

3-
use crate::rustc_codegen_ssa::traits::{BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods};
43
use gccjit::{Struct, Type};
4+
use rustc_codegen_ssa::traits::{BaseTypeMethods, DerivedTypeMethods, LayoutTypeMethods};
55
use rustc_middle::bug;
66
use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
77
use rustc_middle::ty::print::with_no_trimmed_paths;
@@ -205,7 +205,7 @@ impl<'tcx> LayoutGccExt<'tcx> for TyAndLayout<'tcx> {
205205
/// of that field's type - this is useful for taking the address of
206206
/// that field and ensuring the struct has the right alignment.
207207
fn gcc_type<'gcc>(&self, cx: &CodegenCx<'gcc, 'tcx>) -> Type<'gcc> {
208-
use crate::rustc_middle::ty::layout::FnAbiOf;
208+
use rustc_middle::ty::layout::FnAbiOf;
209209
// This must produce the same result for `repr(transparent)` wrappers as for the inner type!
210210
// In other words, this should generally not look at the type at all, but only at the
211211
// layout.

‎compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
# tidy-alphabetical-start
88
ar_archive_writer = "0.2.0"
99
bitflags = "2.4.1"
10-
cc = "1.0.90"
10+
cc = "1.0.97"
1111
itertools = "0.12"
1212
jobserver = "0.1.28"
1313
pathdiff = "0.2.0"

‎compiler/rustc_expand/src/expand.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1194,8 +1194,8 @@ impl InvocationCollectorNode for P<ast::Item> {
11941194
match &ut.kind {
11951195
ast::UseTreeKind::Glob => {}
11961196
ast::UseTreeKind::Simple(_) => idents.push(ut.ident()),
1197-
ast::UseTreeKind::Nested(nested) => {
1198-
for (ut, _) in nested {
1197+
ast::UseTreeKind::Nested { items, .. } => {
1198+
for (ut, _) in items {
11991199
collect_use_tree_leaves(ut, idents);
12001200
}
12011201
}

‎compiler/rustc_hir_typeck/src/fn_ctxt/inspect_obligations.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
//! A utility module to inspect currently ambiguous obligations in the current context.
2-
use crate::rustc_middle::ty::TypeVisitableExt;
32
use crate::FnCtxt;
43
use rustc_infer::traits::solve::Goal;
54
use rustc_infer::traits::{self, ObligationCause};
6-
use rustc_middle::ty::{self, Ty};
5+
use rustc_middle::ty::{self, Ty, TypeVisitableExt};
76
use rustc_span::Span;
87
use rustc_trait_selection::solve::inspect::ProofTreeInferCtxtExt;
98
use rustc_trait_selection::solve::inspect::{InspectConfig, InspectGoal, ProofTreeVisitor};

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+7-25
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::fn_ctxt::rustc_span::BytePos;
66
use crate::hir::is_range_literal;
77
use crate::method::probe;
88
use crate::method::probe::{IsSuggestion, Mode, ProbeScope};
9-
use crate::rustc_middle::ty::Article;
109
use core::cmp::min;
1110
use core::iter;
1211
use hir::def_id::LocalDefId;
@@ -28,7 +27,7 @@ use rustc_middle::lint::in_external_macro;
2827
use rustc_middle::middle::stability::EvalResult;
2928
use rustc_middle::ty::print::with_no_trimmed_paths;
3029
use rustc_middle::ty::{
31-
self, suggest_constraining_type_params, Binder, IsSuggestable, ToPredicate, Ty,
30+
self, suggest_constraining_type_params, Article, Binder, IsSuggestable, ToPredicate, Ty,
3231
TypeVisitableExt,
3332
};
3433
use rustc_session::errors::ExprParenthesesNeeded;
@@ -2227,15 +2226,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22272226
) -> bool {
22282227
let tcx = self.tcx;
22292228
let (adt, args, unwrap) = match expected.kind() {
2230-
// In case Option<NonZero*> is wanted, but * is provided, suggest calling new
2229+
// In case `Option<NonZero<T>>` is wanted, but `T` is provided, suggest calling `new`.
22312230
ty::Adt(adt, args) if tcx.is_diagnostic_item(sym::Option, adt.did()) => {
22322231
let nonzero_type = args.type_at(0); // Unwrap option type.
22332232
let ty::Adt(adt, args) = nonzero_type.kind() else {
22342233
return false;
22352234
};
22362235
(adt, args, "")
22372236
}
2238-
// In case `NonZero<*>` is wanted but `*` is provided, also add `.unwrap()` to satisfy types.
2237+
// In case `NonZero<T>` is wanted but `T` is provided, also add `.unwrap()` to satisfy types.
22392238
ty::Adt(adt, args) => (adt, args, ".unwrap()"),
22402239
_ => return false,
22412240
};
@@ -2244,32 +2243,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
22442243
return false;
22452244
}
22462245

2247-
// FIXME: This can be simplified once `NonZero<T>` is stable.
2248-
let coercable_types = [
2249-
("NonZeroU8", tcx.types.u8),
2250-
("NonZeroU16", tcx.types.u16),
2251-
("NonZeroU32", tcx.types.u32),
2252-
("NonZeroU64", tcx.types.u64),
2253-
("NonZeroU128", tcx.types.u128),
2254-
("NonZeroI8", tcx.types.i8),
2255-
("NonZeroI16", tcx.types.i16),
2256-
("NonZeroI32", tcx.types.i32),
2257-
("NonZeroI64", tcx.types.i64),
2258-
("NonZeroI128", tcx.types.i128),
2259-
];
2260-
22612246
let int_type = args.type_at(0);
2262-
2263-
let Some(nonzero_alias) = coercable_types.iter().find_map(|(nonzero_alias, t)| {
2264-
if *t == int_type && self.can_coerce(expr_ty, *t) { Some(nonzero_alias) } else { None }
2265-
}) else {
2247+
if !self.can_coerce(expr_ty, int_type) {
22662248
return false;
2267-
};
2249+
}
22682250

22692251
err.multipart_suggestion(
2270-
format!("consider calling `{nonzero_alias}::new`"),
2252+
format!("consider calling `{}::new`", sym::NonZero),
22712253
vec![
2272-
(expr.span.shrink_to_lo(), format!("{nonzero_alias}::new(")),
2254+
(expr.span.shrink_to_lo(), format!("{}::new(", sym::NonZero)),
22732255
(expr.span.shrink_to_hi(), format!("){unwrap}")),
22742256
],
22752257
Applicability::MaybeIncorrect,

‎compiler/rustc_lint/src/builtin.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use crate::{
4040
},
4141
EarlyContext, EarlyLintPass, LateContext, LateLintPass, Level, LintContext,
4242
};
43+
use ast::token::TokenKind;
4344
use rustc_ast::tokenstream::{TokenStream, TokenTree};
4445
use rustc_ast::visit::{FnCtxt, FnKind};
4546
use rustc_ast::{self as ast, *};
@@ -1869,16 +1870,24 @@ struct UnderMacro(bool);
18691870

18701871
impl KeywordIdents {
18711872
fn check_tokens(&mut self, cx: &EarlyContext<'_>, tokens: &TokenStream) {
1873+
// Check if the preceding token is `$`, because we want to allow `$async`, etc.
1874+
let mut prev_dollar = false;
18721875
for tt in tokens.trees() {
18731876
match tt {
18741877
// Only report non-raw idents.
18751878
TokenTree::Token(token, _) => {
18761879
if let Some((ident, token::IdentIsRaw::No)) = token.ident() {
1877-
self.check_ident_token(cx, UnderMacro(true), ident);
1880+
if !prev_dollar {
1881+
self.check_ident_token(cx, UnderMacro(true), ident);
1882+
}
1883+
} else if token.kind == TokenKind::Dollar {
1884+
prev_dollar = true;
1885+
continue;
18781886
}
18791887
}
18801888
TokenTree::Delimited(.., tts) => self.check_tokens(cx, tts),
18811889
}
1890+
prev_dollar = false;
18821891
}
18831892
}
18841893

‎compiler/rustc_lint/src/unused.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ declare_lint_pass!(UnusedImportBraces => [UNUSED_IMPORT_BRACES]);
15011501

15021502
impl UnusedImportBraces {
15031503
fn check_use_tree(&self, cx: &EarlyContext<'_>, use_tree: &ast::UseTree, item: &ast::Item) {
1504-
if let ast::UseTreeKind::Nested(ref items) = use_tree.kind {
1504+
if let ast::UseTreeKind::Nested { ref items, .. } = use_tree.kind {
15051505
// Recursively check nested UseTrees
15061506
for (tree, _) in items {
15071507
self.check_use_tree(cx, tree, item);
@@ -1522,7 +1522,7 @@ impl UnusedImportBraces {
15221522
rename.unwrap_or(orig_ident).name
15231523
}
15241524
ast::UseTreeKind::Glob => Symbol::intern("*"),
1525-
ast::UseTreeKind::Nested(_) => return,
1525+
ast::UseTreeKind::Nested { .. } => return,
15261526
};
15271527

15281528
cx.emit_span_lint(

‎compiler/rustc_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ libc = "0.2.73"
1010

1111
[build-dependencies]
1212
# tidy-alphabetical-start
13-
cc = "1.0.90"
13+
cc = "1.0.97"
1414
# tidy-alphabetical-end

‎compiler/rustc_middle/src/ty/layout.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -338,13 +338,14 @@ impl<'tcx> SizeSkeleton<'tcx> {
338338
pointee,
339339
|ty| match tcx.try_normalize_erasing_regions(param_env, ty) {
340340
Ok(ty) => ty,
341-
Err(_e) => {
342-
if let Some(guar) = tcx.dcx().has_errors() {
343-
Ty::new_error(tcx, guar)
344-
} else {
345-
bug!("normalization failed, but no errors reported");
346-
}
347-
}
341+
Err(e) => Ty::new_error_with_message(
342+
tcx,
343+
DUMMY_SP,
344+
format!(
345+
"normalization failed for {} but no errors reported",
346+
e.get_type_for_failure()
347+
),
348+
),
348349
},
349350
|| {},
350351
);

‎compiler/rustc_mir_transform/src/large_enums.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
use crate::rustc_middle::ty::util::IntTypeExt;
21
use rustc_data_structures::fx::FxHashMap;
32
use rustc_middle::mir::interpret::AllocId;
43
use rustc_middle::mir::*;
4+
use rustc_middle::ty::util::IntTypeExt;
55
use rustc_middle::ty::{self, AdtDef, ParamEnv, Ty, TyCtxt};
66
use rustc_session::Session;
77
use rustc_target::abi::{HasDataLayout, Size, TagEncoding, Variants};

0 commit comments

Comments
 (0)