diff options
| author | bors <bors@rust-lang.org> | 2025-07-08 03:30:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-08 03:30:58 +0000 |
| commit | 2783fc43fd13a669f314742890acd64200ad0bbf (patch) | |
| tree | 61f7b83de01b9a9625f848943694ab53af77e37f /compiler/rustc_parse/src/parser | |
| parent | 688ea65df6a47866d0f72a00f1e18b47a7edf83b (diff) | |
| parent | fd05071727ede428ff9a3bf7844f22d2274b7363 (diff) | |
| download | rust-2783fc43fd13a669f314742890acd64200ad0bbf.tar.gz rust-2783fc43fd13a669f314742890acd64200ad0bbf.zip | |
Auto merge of #143621 - matthiaskrgr:rollup-p1ce8l7, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#142098 (Implement `int_format_into` feature) - rust-lang/rust#143567 (Point to correct argument in Func Call when Self type fails trait bound) - rust-lang/rust#143570 (consider nested cases for duplicate RPITIT) - rust-lang/rust#143571 (remove `has_nested` from builtin candidates) - rust-lang/rust#143586 (Fix wrong cache event query key) - rust-lang/rust#143589 (const-block-as-pattern: do not refer to no-longer-existing nightly feature) - rust-lang/rust#143608 (Fix in std::String docs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/mod.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs index cfc0399b0ca..2787be46f33 100644 --- a/compiler/rustc_parse/src/parser/mod.rs +++ b/compiler/rustc_parse/src/parser/mod.rs @@ -1293,8 +1293,10 @@ impl<'a> Parser<'a> { let kind = if pat { let guar = self .dcx() - .struct_span_err(blk_span, "`inline_const_pat` has been removed") - .with_help("use a named `const`-item or an `if`-guard instead") + .struct_span_err(blk_span, "const blocks cannot be used as patterns") + .with_help( + "use a named `const`-item or an `if`-guard (`x if x == const { ... }`) instead", + ) .emit(); ExprKind::Err(guar) } else { |