Skip to content

Commit f581572

Browse files
borsbors
committed
Auto merge of rust-lang#91505 - matthiaskrgr:rollup-orxgsxo, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#90538 (Document how recursion is handled for `ty::Ty`) - rust-lang#90851 (Add unchecked downcast methods) - rust-lang#91209 (Implement ``@snapshot`` check for htmldocck) - rust-lang#91385 (Suggest the `pat_param` specifier before `|` on 2021 edition ) - rust-lang#91478 (Remove incorrect newline from float cast suggestion) - rust-lang#91481 (Use let_else in some more places in rustc_lint) - rust-lang#91488 (Fix ICE when `yield`ing in function returning `impl Trait`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 14c1e71 + df51bff commit f581572

23 files changed

+530
-146
lines changed

‎compiler/rustc_borrowck/src/type_check/input_output.rs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,29 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
117117
}
118118
}
119119

120-
assert!(body.yield_ty().is_some() == universal_regions.yield_ty.is_some());
121-
if let Some(mir_yield_ty) = body.yield_ty() {
122-
let ur_yield_ty = universal_regions.yield_ty.unwrap();
120+
debug!(
121+
"equate_inputs_and_outputs: body.yield_ty {:?}, universal_regions.yield_ty {:?}",
122+
body.yield_ty(),
123+
universal_regions.yield_ty
124+
);
125+
126+
// We will not have a universal_regions.yield_ty if we yield (by accident)
127+
// outside of a generator and return an `impl Trait`, so emit a delay_span_bug
128+
// because we don't want to panic in an assert here if we've already got errors.
129+
if body.yield_ty().is_some() != universal_regions.yield_ty.is_some() {
130+
self.tcx().sess.delay_span_bug(
131+
body.span,
132+
&format!(
133+
"Expected body to have yield_ty ({:?}) iff we have a UR yield_ty ({:?})",
134+
body.yield_ty(),
135+
universal_regions.yield_ty,
136+
),
137+
);
138+
}
139+
140+
if let (Some(mir_yield_ty), Some(ur_yield_ty)) =
141+
(body.yield_ty(), universal_regions.yield_ty)
142+
{
123143
let yield_span = body.local_decls[RETURN_PLACE].source_info.span;
124144
self.equate_normalized_input_or_output(ur_yield_ty, mir_yield_ty, yield_span);
125145
}

‎compiler/rustc_expand/src/mbe/macro_rules.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,6 +1027,24 @@ fn check_matcher_core(
10271027
),
10281028
);
10291029
err.span_label(sp, format!("not allowed after `{}` fragments", kind));
1030+
1031+
if kind == NonterminalKind::PatWithOr
1032+
&& sess.edition == Edition::Edition2021
1033+
&& next_token.is_token(&BinOp(token::BinOpToken::Or))
1034+
{
1035+
let suggestion = quoted_tt_to_string(&TokenTree::MetaVarDecl(
1036+
span,
1037+
name,
1038+
Some(NonterminalKind::PatParam { inferred: false }),
1039+
));
1040+
err.span_suggestion(
1041+
span,
1042+
&format!("try a `pat_param` fragment specifier instead"),
1043+
suggestion,
1044+
Applicability::MaybeIncorrect,
1045+
);
1046+
}
1047+
10301048
let msg = "allowed there are: ";
10311049
match possible {
10321050
&[] => {}

‎compiler/rustc_lint/src/array_into_iter.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@ impl<'tcx> LateLintPass<'tcx> for ArrayIntoIter {
7979
let receiver_ty = cx.typeck_results().expr_ty(receiver_arg);
8080
let adjustments = cx.typeck_results().expr_adjustments(receiver_arg);
8181

82-
let target = match adjustments.last() {
83-
Some(Adjustment { kind: Adjust::Borrow(_), target }) => target,
84-
_ => return,
82+
let Some(Adjustment { kind: Adjust::Borrow(_), target }) = adjustments.last() else {
83+
return
8584
};
8685

8786
let types =

‎compiler/rustc_lint/src/builtin.rs

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -609,14 +609,12 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
609609
// If the trait is private, add the impl items to `private_traits` so they don't get
610610
// reported for missing docs.
611611
let real_trait = trait_ref.path.res.def_id();
612-
if let Some(def_id) = real_trait.as_local() {
613-
let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
614-
if let Some(Node::Item(item)) = cx.tcx.hir().find(hir_id) {
615-
if let hir::VisibilityKind::Inherited = item.vis.node {
616-
for impl_item_ref in items {
617-
self.private_traits.insert(impl_item_ref.id.hir_id());
618-
}
619-
}
612+
let Some(def_id) = real_trait.as_local() else { return };
613+
let hir_id = cx.tcx.hir().local_def_id_to_hir_id(def_id);
614+
let Some(Node::Item(item)) = cx.tcx.hir().find(hir_id) else { return };
615+
if let hir::VisibilityKind::Inherited = item.vis.node {
616+
for impl_item_ref in items {
617+
self.private_traits.insert(impl_item_ref.id.hir_id());
620618
}
621619
}
622620
return;
@@ -829,9 +827,8 @@ impl<'tcx> LateLintPass<'tcx> for MissingDebugImplementations {
829827
_ => return,
830828
}
831829

832-
let debug = match cx.tcx.get_diagnostic_item(sym::Debug) {
833-
Some(debug) => debug,
834-
None => return,
830+
let Some(debug) = cx.tcx.get_diagnostic_item(sym::Debug) else {
831+
return
835832
};
836833

837834
if self.impling_types.is_none() {
@@ -1509,9 +1506,8 @@ impl TypeAliasBounds {
15091506

15101507
impl<'tcx> LateLintPass<'tcx> for TypeAliasBounds {
15111508
fn check_item(&mut self, cx: &LateContext<'_>, item: &hir::Item<'_>) {
1512-
let (ty, type_alias_generics) = match item.kind {
1513-
hir::ItemKind::TyAlias(ref ty, ref generics) => (&*ty, generics),
1514-
_ => return,
1509+
let hir::ItemKind::TyAlias(ty, type_alias_generics) = &item.kind else {
1510+
return
15151511
};
15161512
if let hir::TyKind::OpaqueDef(..) = ty.kind {
15171513
// Bounds are respected for `type X = impl Trait`
@@ -2266,16 +2262,15 @@ impl<'tcx> LateLintPass<'tcx> for ExplicitOutlivesRequirements {
22662262
// and should check for them here.
22672263
match predicate.bounded_ty.kind {
22682264
hir::TyKind::Path(hir::QPath::Resolved(None, ref path)) => {
2269-
if let Res::Def(DefKind::TyParam, def_id) = path.res {
2270-
let index = ty_generics.param_def_id_to_index[&def_id];
2271-
(
2272-
Self::lifetimes_outliving_type(inferred_outlives, index),
2273-
&predicate.bounds,
2274-
predicate.span,
2275-
)
2276-
} else {
2277-
continue;
2278-
}
2265+
let Res::Def(DefKind::TyParam, def_id) = path.res else {
2266+
continue
2267+
};
2268+
let index = ty_generics.param_def_id_to_index[&def_id];
2269+
(
2270+
Self::lifetimes_outliving_type(inferred_outlives, index),
2271+
&predicate.bounds,
2272+
predicate.span,
2273+
)
22792274
}
22802275
_ => {
22812276
continue;
@@ -3216,18 +3211,17 @@ impl<'tcx> LateLintPass<'tcx> for NamedAsmLabels {
32163211
for (idx, _) in statement.match_indices(':') {
32173212
let possible_label = statement[start_idx..idx].trim();
32183213
let mut chars = possible_label.chars();
3219-
if let Some(c) = chars.next() {
3220-
// A label starts with an alphabetic character or . or _ and continues with alphanumeric characters, _, or $
3221-
if (c.is_alphabetic() || matches!(c, '.' | '_'))
3222-
&& chars.all(|c| c.is_alphanumeric() || matches!(c, '_' | '$'))
3223-
{
3224-
found_labels.push(possible_label);
3225-
} else {
3226-
// If we encounter a non-label, there cannot be any further labels, so stop checking
3227-
break;
3228-
}
3229-
} else {
3214+
let Some(c) = chars.next() else {
32303215
// Empty string means a leading ':' in this section, which is not a label
3216+
break
3217+
};
3218+
// A label starts with an alphabetic character or . or _ and continues with alphanumeric characters, _, or $
3219+
if (c.is_alphabetic() || matches!(c, '.' | '_'))
3220+
&& chars.all(|c| c.is_alphanumeric() || matches!(c, '_' | '$'))
3221+
{
3222+
found_labels.push(possible_label);
3223+
} else {
3224+
// If we encounter a non-label, there cannot be any further labels, so stop checking
32313225
break;
32323226
}
32333227

‎compiler/rustc_lint/src/levels.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,12 @@ impl<'s> LintLevelsBuilder<'s> {
227227
let sess = self.sess;
228228
let bad_attr = |span| struct_span_err!(sess, span, E0452, "malformed lint attribute input");
229229
for attr in attrs {
230-
let level = match Level::from_symbol(attr.name_or_empty()) {
231-
None => continue,
232-
Some(lvl) => lvl,
230+
let Some(level) = Level::from_symbol(attr.name_or_empty()) else {
231+
continue
233232
};
234233

235-
let mut metas = match attr.meta_item_list() {
236-
Some(x) => x,
237-
None => continue,
234+
let Some(mut metas) = attr.meta_item_list() else {
235+
continue
238236
};
239237

240238
if metas.is_empty() {
@@ -481,9 +479,8 @@ impl<'s> LintLevelsBuilder<'s> {
481479
continue;
482480
}
483481

484-
let (lint_attr_name, lint_attr_span) = match *src {
485-
LintLevelSource::Node(name, span, _) => (name, span),
486-
_ => continue,
482+
let LintLevelSource::Node(lint_attr_name, lint_attr_span, _) = *src else {
483+
continue
487484
};
488485

489486
let lint = builtin::UNUSED_ATTRIBUTES;

‎compiler/rustc_lint/src/noop_method_call.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ declare_lint_pass!(NoopMethodCall => [NOOP_METHOD_CALL]);
4040
impl<'tcx> LateLintPass<'tcx> for NoopMethodCall {
4141
fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
4242
// We only care about method calls.
43-
let (call, elements) = match expr.kind {
44-
ExprKind::MethodCall(call, _, elements, _) => (call, elements),
45-
_ => return,
43+
let ExprKind::MethodCall(call, _, elements, _) = &expr.kind else {
44+
return
4645
};
4746
// We only care about method calls corresponding to the `Clone`, `Deref` and `Borrow`
4847
// traits and ignore any other method call.
@@ -70,9 +69,8 @@ impl<'tcx> LateLintPass<'tcx> for NoopMethodCall {
7069
}
7170
let param_env = cx.tcx.param_env(trait_id);
7271
// Resolve the trait method instance.
73-
let i = match ty::Instance::resolve(cx.tcx, param_env, did, substs) {
74-
Ok(Some(i)) => i,
75-
_ => return,
72+
let Ok(Some(i)) = ty::Instance::resolve(cx.tcx, param_env, did, substs) else {
73+
return
7674
};
7775
// (Re)check that it implements the noop diagnostic.
7876
let Some(name) = cx.tcx.get_diagnostic_name(i.def_id()) else { return };

‎compiler/rustc_lint/src/traits.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ impl<'tcx> LateLintPass<'tcx> for DropTraitConstraints {
9191

9292
let predicates = cx.tcx.explicit_predicates_of(item.def_id);
9393
for &(predicate, span) in predicates.predicates {
94-
let trait_predicate = match predicate.kind().skip_binder() {
95-
Trait(trait_predicate) => trait_predicate,
96-
_ => continue,
94+
let Trait(trait_predicate) = predicate.kind().skip_binder() else {
95+
continue
9796
};
9897
if trait_predicate.constness == ty::BoundConstness::ConstIfConst {
9998
// `~const Drop` definitely have meanings so avoid linting here.
@@ -106,9 +105,8 @@ impl<'tcx> LateLintPass<'tcx> for DropTraitConstraints {
106105
continue;
107106
}
108107
cx.struct_span_lint(DROP_BOUNDS, span, |lint| {
109-
let needs_drop = match cx.tcx.get_diagnostic_item(sym::needs_drop) {
110-
Some(needs_drop) => needs_drop,
111-
None => return,
108+
let Some(needs_drop) = cx.tcx.get_diagnostic_item(sym::needs_drop) else {
109+
return
112110
};
113111
let msg = format!(
114112
"bounds on `{}` are most likely incorrect, consider instead \
@@ -123,17 +121,15 @@ impl<'tcx> LateLintPass<'tcx> for DropTraitConstraints {
123121
}
124122

125123
fn check_ty(&mut self, cx: &LateContext<'_>, ty: &'tcx hir::Ty<'tcx>) {
126-
let bounds = match &ty.kind {
127-
hir::TyKind::TraitObject(bounds, _lifetime, _syntax) => bounds,
128-
_ => return,
124+
let hir::TyKind::TraitObject(bounds, _lifetime, _syntax) = &ty.kind else {
125+
return
129126
};
130127
for bound in &bounds[..] {
131128
let def_id = bound.trait_ref.trait_def_id();
132129
if cx.tcx.lang_items().drop_trait() == def_id {
133130
cx.struct_span_lint(DYN_DROP, bound.span, |lint| {
134-
let needs_drop = match cx.tcx.get_diagnostic_item(sym::needs_drop) {
135-
Some(needs_drop) => needs_drop,
136-
None => return,
131+
let Some(needs_drop) = cx.tcx.get_diagnostic_item(sym::needs_drop) else {
132+
return
137133
};
138134
let msg = format!(
139135
"types that do not implement `Drop` can still have drop glue, consider \

‎compiler/rustc_lint/src/types.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,11 +1342,10 @@ impl<'tcx> LateLintPass<'tcx> for VariantSizeDifferences {
13421342
| ty::layout::LayoutError::NormalizationFailure(_, _),
13431343
) => return,
13441344
};
1345-
let (variants, tag) = match layout.variants {
1346-
Variants::Multiple {
1345+
let Variants::Multiple {
13471346
tag_encoding: TagEncoding::Direct, tag, ref variants, ..
1348-
} => (variants, tag),
1349-
_ => return,
1347+
} = &layout.variants else {
1348+
return
13501349
};
13511350

13521351
let tag_size = tag.value.size(&cx.tcx).bytes();

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,30 @@ bitflags! {
6464
/// Moreover, Rust only allows recursive data types through indirection.
6565
///
6666
/// [adt]: https://en.wikipedia.org/wiki/Algebraic_data_type
67+
///
68+
/// # Recursive types
69+
///
70+
/// It may seem impossible to represent recursive types using [`Ty`],
71+
/// since [`TyKind::Adt`] includes [`AdtDef`], which includes its fields,
72+
/// creating a cycle. However, `AdtDef` does not actually include the *types*
73+
/// of its fields; it includes just their [`DefId`]s.
74+
///
75+
/// [`TyKind::Adt`]: ty::TyKind::Adt
76+
///
77+
/// For example, the following type:
78+
///
79+
/// ```
80+
/// struct S { x: Box<S> }
81+
/// ```
82+
///
83+
/// is essentially represented with [`Ty`] as the following pseudocode:
84+
///
85+
/// ```
86+
/// struct S { x }
87+
/// ```
88+
///
89+
/// where `x` here represents the `DefId` of `S.x`. Then, the `DefId`
90+
/// can be used with [`TyCtxt::type_of()`] to get the type of the field.
6791
pub struct AdtDef {
6892
/// The `DefId` of the struct, enum or union item.
6993
pub did: DefId,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ impl ReprOptions {
17111711

17121712
impl<'tcx> FieldDef {
17131713
/// Returns the type of this field. The resulting type is not normalized. The `subst` is
1714-
/// typically obtained via the second field of `TyKind::AdtDef`.
1714+
/// typically obtained via the second field of [`TyKind::Adt`].
17151715
pub fn ty(&self, tcx: TyCtxt<'tcx>, subst: SubstsRef<'tcx>) -> Ty<'tcx> {
17161716
tcx.type_of(self.did).subst(tcx, subst)
17171717
}

‎compiler/rustc_typeck/src/check/demand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1223,7 +1223,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
12231223
// Missing try_into implementation for `{integer}` to `{float}`
12241224
err.multipart_suggestion_verbose(
12251225
&format!(
1226-
"{}, producing the floating point representation of the integer,
1226+
"{}, producing the floating point representation of the integer, \
12271227
rounded if necessary",
12281228
cast_msg,
12291229
),

0 commit comments

Comments
 (0)