diff options
| author | bors <bors@rust-lang.org> | 2022-04-17 00:44:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-17 00:44:53 +0000 |
| commit | 2c28b0eaf9843ec0f493fca2dba506fe4d9174fb (patch) | |
| tree | 5911ea08448072405a169ece70c78e940b5445d1 /compiler/rustc_parse/src | |
| parent | 563ef23529ae800b2b136cabdc71a81d86a75f58 (diff) | |
| parent | b47265e65866cf94ee3bb82908bbc5138ed1f5a7 (diff) | |
| download | rust-2c28b0eaf9843ec0f493fca2dba506fe4d9174fb.tar.gz rust-2c28b0eaf9843ec0f493fca2dba506fe4d9174fb.zip | |
Auto merge of #96134 - Dylan-DPC:rollup-ejug3yq, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #95346 (Stablize `const_extern_fn` for "Rust" and "C") - #95933 (htmldocck: Compare HTML tree instead of plain text html) - #96105 (Make the debug output for `TargetSelection` less verbose) - #96112 (Strict provenance lint diagnostics improvements) - #96119 (update Miri) - #96124 (to_digit tweak) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/ty.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs index 436c5bd4fca..bb387064e27 100644 --- a/compiler/rustc_parse/src/parser/ty.rs +++ b/compiler/rustc_parse/src/parser/ty.rs @@ -523,6 +523,9 @@ impl<'a> Parser<'a> { let decl = self.parse_fn_decl(|_| false, AllowPlus::No, recover_return_sign)?; let whole_span = lo.to(self.prev_token.span); if let ast::Const::Yes(span) = constness { + // If we ever start to allow `const fn()`, then update + // feature gating for `#![feature(const_extern_fn)]` to + // cover it. self.error_fn_ptr_bad_qualifier(whole_span, span, "const"); } if let ast::Async::Yes { span, .. } = asyncness { |