Skip to content

Commit ce4727f

Browse files
borsbors
committed
Auto merge of rust-lang#118443 - matthiaskrgr:rollup-mp8o3m4, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#118157 (Add `never_patterns` feature gate) - rust-lang#118191 (Suggest `let` or `==` on typo'd let-chain) - rust-lang#118231 (also add is_empty to const raw slices) - rust-lang#118333 (Print list of missing target features when calling a function with target features outside an unsafe block) - rust-lang#118426 (ConstProp: Correctly remove const if unknown value assigned to it.) - rust-lang#118428 (rustdoc: Move `AssocItemRender` and `RenderMode` to `html::render`.) - rust-lang#118438 (Update nto-qnx.md) Failed merges: - rust-lang#118268 (Pretty print `Fn<(..., ...)>` trait refs with parentheses (almost) always) r? `@ghost` `@rustbot` modify labels: rollup
2 parents ec1f21c + 6094cb5 commit ce4727f

File tree

66 files changed

+909
-187
lines changed

Some content is hidden

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

66 files changed

+909
-187
lines changed

Diff for: ‎compiler/rustc_ast/src/ast.rs

+4
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ impl Pat {
645645
// These patterns do not contain subpatterns, skip.
646646
PatKind::Wild
647647
| PatKind::Rest
648+
| PatKind::Never
648649
| PatKind::Lit(_)
649650
| PatKind::Range(..)
650651
| PatKind::Ident(..)
@@ -795,6 +796,9 @@ pub enum PatKind {
795796
/// only one rest pattern may occur in the pattern sequences.
796797
Rest,
797798

799+
// A never pattern `!`
800+
Never,
801+
798802
/// Parentheses in patterns used for grouping (i.e., `(PAT)`).
799803
Paren(P<Pat>),
800804

Diff for: ‎compiler/rustc_ast/src/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {
12491249
let Pat { id, kind, span, tokens } = pat.deref_mut();
12501250
vis.visit_id(id);
12511251
match kind {
1252-
PatKind::Wild | PatKind::Rest => {}
1252+
PatKind::Wild | PatKind::Rest | PatKind::Never => {}
12531253
PatKind::Ident(_binding_mode, ident, sub) => {
12541254
vis.visit_ident(ident);
12551255
visit_opt(sub, |sub| vis.visit_pat(sub));

Diff for: ‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
559559
walk_list!(visitor, visit_expr, lower_bound);
560560
walk_list!(visitor, visit_expr, upper_bound);
561561
}
562-
PatKind::Wild | PatKind::Rest => {}
562+
PatKind::Wild | PatKind::Rest | PatKind::Never => {}
563563
PatKind::Tuple(elems) | PatKind::Slice(elems) | PatKind::Or(elems) => {
564564
walk_list!(visitor, visit_pat, elems);
565565
}

Diff for: ‎compiler/rustc_ast_lowering/src/pat.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
2424
let node = loop {
2525
match &pattern.kind {
2626
PatKind::Wild => break hir::PatKind::Wild,
27+
PatKind::Never => break hir::PatKind::Never,
2728
PatKind::Ident(binding_mode, ident, sub) => {
2829
let lower_sub = |this: &mut Self| sub.as_ref().map(|s| this.lower_pat(s));
2930
break self.lower_pat_ident(pattern, *binding_mode, *ident, lower_sub);

Diff for: ‎compiler/rustc_ast_passes/src/feature_gate.rs

+1
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ pub fn check_crate(krate: &ast::Crate, sess: &Session, features: &Features) {
555555
gate_all!(explicit_tail_calls, "`become` expression is experimental");
556556
gate_all!(generic_const_items, "generic const items are experimental");
557557
gate_all!(unnamed_fields, "unnamed fields are not yet fully implemented");
558+
gate_all!(never_patterns, "`!` patterns are experimental");
558559

559560
if !visitor.features.negative_bounds {
560561
for &span in spans.get(&sym::negative_bounds).iter().copied().flatten() {

Diff for: ‎compiler/rustc_ast_pretty/src/pprust/state.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,7 @@ impl<'a> State<'a> {
13431343
is that it doesn't matter */
13441344
match &pat.kind {
13451345
PatKind::Wild => self.word("_"),
1346+
PatKind::Never => self.word("!"),
13461347
PatKind::Ident(BindingAnnotation(by_ref, mutbl), ident, sub) => {
13471348
if *by_ref == ByRef::Yes {
13481349
self.word_nbsp("ref");

Diff for: ‎compiler/rustc_feature/src/unstable.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ macro_rules! declare_features {
155155
// was set.
156156
//
157157
// Note that the features are grouped into internal/user-facing and then
158-
// sorted by version inside those groups. This is enforced with tidy.
158+
// sorted alphabetically inside those groups. This is enforced with tidy.
159159
//
160160
// N.B., `tools/tidy/src/features.rs` parses this information directly out of the
161161
// source, so take care when modifying it.
@@ -520,6 +520,8 @@ declare_features! (
520520
(unstable, native_link_modifiers_as_needed, "1.53.0", Some(81490), None),
521521
/// Allow negative trait implementations.
522522
(unstable, negative_impls, "1.44.0", Some(68318), None),
523+
/// Allows the `!` pattern.
524+
(incomplete, never_patterns, "CURRENT_RUSTC_VERSION", Some(118155), None),
523525
/// Allows the `!` type. Does not imply 'exhaustive_patterns' (below) any more.
524526
(unstable, never_type, "1.13.0", Some(35121), None),
525527
/// Allows diverging expressions to fall back to `!` rather than `()`.

Diff for: ‎compiler/rustc_hir/src/hir.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ impl<'hir> Pat<'hir> {
10021002

10031003
use PatKind::*;
10041004
match self.kind {
1005-
Wild | Lit(_) | Range(..) | Binding(.., None) | Path(_) => true,
1005+
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) => true,
10061006
Box(s) | Ref(s, _) | Binding(.., Some(s)) => s.walk_short_(it),
10071007
Struct(_, fields, _) => fields.iter().all(|field| field.pat.walk_short_(it)),
10081008
TupleStruct(_, s, _) | Tuple(s, _) | Or(s) => s.iter().all(|p| p.walk_short_(it)),
@@ -1029,7 +1029,7 @@ impl<'hir> Pat<'hir> {
10291029

10301030
use PatKind::*;
10311031
match self.kind {
1032-
Wild | Lit(_) | Range(..) | Binding(.., None) | Path(_) => {}
1032+
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) => {}
10331033
Box(s) | Ref(s, _) | Binding(.., Some(s)) => s.walk_(it),
10341034
Struct(_, fields, _) => fields.iter().for_each(|field| field.pat.walk_(it)),
10351035
TupleStruct(_, s, _) | Tuple(s, _) | Or(s) => s.iter().for_each(|p| p.walk_(it)),
@@ -1142,6 +1142,9 @@ pub enum PatKind<'hir> {
11421142
/// Invariant: `pats.len() >= 2`.
11431143
Or(&'hir [Pat<'hir>]),
11441144

1145+
/// A never pattern `!`.
1146+
Never,
1147+
11451148
/// A path pattern for a unit struct/variant or a (maybe-associated) constant.
11461149
Path(QPath<'hir>),
11471150

Diff for: ‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat<'v>) {
660660
walk_list!(visitor, visit_expr, lower_bound);
661661
walk_list!(visitor, visit_expr, upper_bound);
662662
}
663-
PatKind::Wild => (),
663+
PatKind::Never | PatKind::Wild => (),
664664
PatKind::Slice(prepatterns, ref slice_pattern, postpatterns) => {
665665
walk_list!(visitor, visit_pat, prepatterns);
666666
walk_list!(visitor, visit_pat, slice_pattern);

Diff for: ‎compiler/rustc_hir_analysis/src/check/region.rs

+1
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,7 @@ fn resolve_local<'tcx>(
662662
PatKind::Ref(_, _)
663663
| PatKind::Binding(hir::BindingAnnotation(hir::ByRef::No, _), ..)
664664
| PatKind::Wild
665+
| PatKind::Never
665666
| PatKind::Path(_)
666667
| PatKind::Lit(_)
667668
| PatKind::Range(_, _, _) => false,

Diff for: ‎compiler/rustc_hir_pretty/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1724,6 +1724,7 @@ impl<'a> State<'a> {
17241724
// is that it doesn't matter
17251725
match pat.kind {
17261726
PatKind::Wild => self.word("_"),
1727+
PatKind::Never => self.word("!"),
17271728
PatKind::Binding(BindingAnnotation(by_ref, mutbl), _, ident, sub) => {
17281729
if by_ref == ByRef::Yes {
17291730
self.word_nbsp("ref");

Diff for: ‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -401,12 +401,17 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
401401
mc.cat_pattern(discr_place.clone(), pat, |place, pat| {
402402
match &pat.kind {
403403
PatKind::Binding(.., opt_sub_pat) => {
404-
// If the opt_sub_pat is None, than the binding does not count as
404+
// If the opt_sub_pat is None, then the binding does not count as
405405
// a wildcard for the purpose of borrowing discr.
406406
if opt_sub_pat.is_none() {
407407
needs_to_be_read = true;
408408
}
409409
}
410+
PatKind::Never => {
411+
// A never pattern reads the value.
412+
// FIXME(never_patterns): does this do what I expect?
413+
needs_to_be_read = true;
414+
}
410415
PatKind::Path(qpath) => {
411416
// A `Path` pattern is just a name like `Foo`. This is either a
412417
// named constant or else it refers to an ADT variant

Diff for: ‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+1
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
766766
| PatKind::Binding(.., None)
767767
| PatKind::Lit(..)
768768
| PatKind::Range(..)
769+
| PatKind::Never
769770
| PatKind::Wild => {
770771
// always ok
771772
}

Diff for: ‎compiler/rustc_hir_typeck/src/pat.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
178178

179179
let ty = match pat.kind {
180180
PatKind::Wild => expected,
181+
// FIXME(never_patterns): check the type is uninhabited. If that is not possible within
182+
// typeck, do that in a later phase.
183+
PatKind::Never => expected,
181184
PatKind::Lit(lt) => self.check_pat_lit(pat.span, lt, expected, ti),
182185
PatKind::Range(lhs, rhs, _) => self.check_pat_range(pat.span, lhs, rhs, expected, ti),
183186
PatKind::Binding(ba, var_id, _, sub) => {
@@ -287,9 +290,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
287290
| PatKind::Box(_)
288291
| PatKind::Range(..)
289292
| PatKind::Slice(..) => AdjustMode::Peel,
293+
// A never pattern behaves somewhat like a literal or unit variant.
294+
PatKind::Never => AdjustMode::Peel,
290295
// String and byte-string literals result in types `&str` and `&[u8]` respectively.
291296
// All other literals result in non-reference types.
292-
// As a result, we allow `if let 0 = &&0 {}` but not `if let "foo" = &&"foo {}`.
297+
// As a result, we allow `if let 0 = &&0 {}` but not `if let "foo" = &&"foo" {}`.
293298
//
294299
// Call `resolve_vars_if_possible` here for inline const blocks.
295300
PatKind::Lit(lt) => match self.resolve_vars_if_possible(self.check_expr(lt)).kind() {
@@ -743,6 +748,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
743748
| PatKind::Slice(..) => "binding",
744749

745750
PatKind::Wild
751+
| PatKind::Never
746752
| PatKind::Binding(..)
747753
| PatKind::Path(..)
748754
| PatKind::Box(..)

Diff for: ‎compiler/rustc_lint/src/unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ impl EarlyLintPass for UnusedParens {
11541154
// Do not lint on `(..)` as that will result in the other arms being useless.
11551155
Paren(_)
11561156
// The other cases do not contain sub-patterns.
1157-
| Wild | Rest | Lit(..) | MacCall(..) | Range(..) | Ident(.., None) | Path(..) => {},
1157+
| Wild | Never | Rest | Lit(..) | MacCall(..) | Range(..) | Ident(.., None) | Path(..) => {},
11581158
// These are list-like patterns; parens can always be removed.
11591159
TupleStruct(_, _, ps) | Tuple(ps) | Slice(ps) | Or(ps) => for p in ps {
11601160
self.check_unused_parens_pat(cx, p, false, false, keep_space);

Diff for: ‎compiler/rustc_middle/src/mir/query.rs

+10-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub enum UnsafetyViolationKind {
2727
UnsafeFn,
2828
}
2929

30-
#[derive(Copy, Clone, PartialEq, TyEncodable, TyDecodable, HashStable, Debug)]
30+
#[derive(Clone, PartialEq, TyEncodable, TyDecodable, HashStable, Debug)]
3131
pub enum UnsafetyViolationDetails {
3232
CallToUnsafeFunction,
3333
UseOfInlineAssembly,
@@ -39,10 +39,17 @@ pub enum UnsafetyViolationDetails {
3939
AccessToUnionField,
4040
MutationOfLayoutConstrainedField,
4141
BorrowOfLayoutConstrainedField,
42-
CallToFunctionWith,
42+
CallToFunctionWith {
43+
/// Target features enabled in callee's `#[target_feature]` but missing in
44+
/// caller's `#[target_feature]`.
45+
missing: Vec<Symbol>,
46+
/// Target features in `missing` that are enabled at compile time
47+
/// (e.g., with `-C target-feature`).
48+
build_enabled: Vec<Symbol>,
49+
},
4350
}
4451

45-
#[derive(Copy, Clone, PartialEq, TyEncodable, TyDecodable, HashStable, Debug)]
52+
#[derive(Clone, PartialEq, TyEncodable, TyDecodable, HashStable, Debug)]
4653
pub struct UnsafetyViolation {
4754
pub source_info: SourceInfo,
4855
pub lint_root: hir::HirId,

Diff for: ‎compiler/rustc_middle/src/thir.rs

+10-1
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,12 @@ impl<'tcx> Pat<'tcx> {
635635

636636
use PatKind::*;
637637
match &self.kind {
638-
Wild | Range(..) | Binding { subpattern: None, .. } | Constant { .. } | Error(_) => {}
638+
Wild
639+
| Never
640+
| Range(..)
641+
| Binding { subpattern: None, .. }
642+
| Constant { .. }
643+
| Error(_) => {}
639644
AscribeUserType { subpattern, .. }
640645
| Binding { subpattern: Some(subpattern), .. }
641646
| Deref { subpattern }
@@ -809,6 +814,9 @@ pub enum PatKind<'tcx> {
809814
pats: Box<[Box<Pat<'tcx>>]>,
810815
},
811816

817+
/// A never pattern `!`.
818+
Never,
819+
812820
/// An error has been encountered during lowering. We probably shouldn't report more lints
813821
/// related to this pattern.
814822
Error(ErrorGuaranteed),
@@ -1069,6 +1077,7 @@ impl<'tcx> fmt::Display for Pat<'tcx> {
10691077

10701078
match self.kind {
10711079
PatKind::Wild => write!(f, "_"),
1080+
PatKind::Never => write!(f, "!"),
10721081
PatKind::AscribeUserType { ref subpattern, .. } => write!(f, "{subpattern}: _"),
10731082
PatKind::Binding { mutability, name, mode, ref subpattern, .. } => {
10741083
let is_mut = match mode {

Diff for: ‎compiler/rustc_middle/src/thir/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ pub fn walk_pat<'a, 'tcx: 'a, V: Visitor<'a, 'tcx>>(visitor: &mut V, pat: &Pat<'
227227
is_primary: _,
228228
name: _,
229229
} => visitor.visit_pat(subpattern),
230-
Binding { .. } | Wild | Error(_) => {}
230+
Binding { .. } | Wild | Never | Error(_) => {}
231231
Variant { subpatterns, adt_def: _, args: _, variant_index: _ } | Leaf { subpatterns } => {
232232
for subpattern in subpatterns {
233233
visitor.visit_pat(&subpattern.pattern);

Diff for: ‎compiler/rustc_mir_build/messages.ftl

+33-3
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,32 @@ mir_build_borrow_of_moved_value = borrow of moved value
3030
3131
mir_build_call_to_fn_with_requires_unsafe =
3232
call to function `{$function}` with `#[target_feature]` is unsafe and requires unsafe block
33-
.note = can only be called if the required target features are available
33+
.help = in order for the call to be safe, the context requires the following additional target {$missing_target_features_count ->
34+
[1] feature
35+
*[count] features
36+
}: {$missing_target_features}
37+
.note = the {$build_target_features} target {$build_target_features_count ->
38+
[1] feature
39+
*[count] features
40+
} being enabled in the build configuration does not remove the requirement to list {$build_target_features_count ->
41+
[1] it
42+
*[count] them
43+
} in `#[target_feature]`
3444
.label = call to function with `#[target_feature]`
3545
3646
mir_build_call_to_fn_with_requires_unsafe_unsafe_op_in_unsafe_fn_allowed =
3747
call to function `{$function}` with `#[target_feature]` is unsafe and requires unsafe function or block
38-
.note = can only be called if the required target features are available
48+
.help = in order for the call to be safe, the context requires the following additional target {$missing_target_features_count ->
49+
[1] feature
50+
*[count] features
51+
}: {$missing_target_features}
52+
.note = the {$build_target_features} target {$build_target_features_count ->
53+
[1] feature
54+
*[count] features
55+
} being enabled in the build configuration does not remove the requirement to list {$build_target_features_count ->
56+
[1] it
57+
*[count] them
58+
} in `#[target_feature]`
3959
.label = call to function with `#[target_feature]`
4060
4161
mir_build_call_to_unsafe_fn_requires_unsafe =
@@ -330,7 +350,17 @@ mir_build_unsafe_op_in_unsafe_fn_borrow_of_layout_constrained_field_requires_uns
330350
331351
mir_build_unsafe_op_in_unsafe_fn_call_to_fn_with_requires_unsafe =
332352
call to function `{$function}` with `#[target_feature]` is unsafe and requires unsafe block (error E0133)
333-
.note = can only be called if the required target features are available
353+
.help = in order for the call to be safe, the context requires the following additional target {$missing_target_features_count ->
354+
[1] feature
355+
*[count] features
356+
}: {$missing_target_features}
357+
.note = the {$build_target_features} target {$build_target_features_count ->
358+
[1] feature
359+
*[count] features
360+
} being enabled in the build configuration does not remove the requirement to list {$build_target_features_count ->
361+
[1] it
362+
*[count] them
363+
} in `#[target_feature]`
334364
.label = call to function with `#[target_feature]`
335365
336366
mir_build_unsafe_op_in_unsafe_fn_call_to_unsafe_fn_requires_unsafe =

Diff for: ‎compiler/rustc_mir_build/src/build/matches/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
827827
PatKind::Constant { .. }
828828
| PatKind::Range { .. }
829829
| PatKind::Wild
830+
| PatKind::Never
830831
| PatKind::Error(_) => {}
831832

832833
PatKind::Deref { ref subpattern } => {

Diff for: ‎compiler/rustc_mir_build/src/build/matches/simplify.rs

+6
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
194194
Ok(())
195195
}
196196

197+
PatKind::Never => {
198+
// A never pattern acts like a load from the place.
199+
// FIXME(never_patterns): load from the place
200+
Ok(())
201+
}
202+
197203
PatKind::Constant { .. } => {
198204
// FIXME normalize patterns when possible
199205
Err(match_pair)

Diff for: ‎compiler/rustc_mir_build/src/build/matches/test.rs

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
7575
| PatKind::Array { .. }
7676
| PatKind::Wild
7777
| PatKind::Binding { .. }
78+
| PatKind::Never
7879
| PatKind::Leaf { .. }
7980
| PatKind::Deref { .. }
8081
| PatKind::Error(_) => self.error_simplifiable(match_pair),
@@ -107,6 +108,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
107108
PatKind::Slice { .. }
108109
| PatKind::Array { .. }
109110
| PatKind::Wild
111+
| PatKind::Never
110112
| PatKind::Or { .. }
111113
| PatKind::Binding { .. }
112114
| PatKind::AscribeUserType { .. }

0 commit comments

Comments
 (0)