about summary refs log tree commit diff
path: root/compiler
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2022-07-19 13:30:48 +0200
committerGitHub <noreply@github.com>2022-07-19 13:30:48 +0200
commit19932a55335d00c9829c5fc6473bc6cf0b689aff (patch)
treee70cf7b3b0d90d5b46ac93890d1b089bb58e0bb4 /compiler
parent7d754976c4644c783091107bf2d85136f3d89fdc (diff)
parentc0569f2aa7311d295cb273f66fbe365f2b5ad893 (diff)
downloadrust-19932a55335d00c9829c5fc6473bc6cf0b689aff.tar.gz
rust-19932a55335d00c9829c5fc6473bc6cf0b689aff.zip
Rollup merge of #99435 - CAD97:revert-dollar-dollar-crate, r=Mark-Simulacrum
Revert "Stabilize $$ in Rust 1.63.0"

This mechanically reverts commit 9edaa76adce4de737db54194eb13d6c298827b37, the one commit from #95860.

https://github.com/rust-lang/rust/issues/99035; the behavior of `$$crate` is potentially unexpected and not ready to be stabilized. https://github.com/rust-lang/rust/pull/99193 attempts to forbid `$$crate` without also destabilizing `$$` more generally.

`@rustbot` modify labels +T-compiler +T-lang +P-medium +beta-nominated +relnotes

(applying the labels I think are accurate from the issue and alternative partial revert)

cc `@Mark-Simulacrum`
Diffstat (limited to 'compiler')
-rw-r--r--compiler/rustc_expand/src/mbe/quoted.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_expand/src/mbe/quoted.rs b/compiler/rustc_expand/src/mbe/quoted.rs
index d4b8563a036..707cb73f097 100644
--- a/compiler/rustc_expand/src/mbe/quoted.rs
+++ b/compiler/rustc_expand/src/mbe/quoted.rs
@@ -234,6 +234,8 @@ fn parse_tree(
                             sess,
                             &Token { kind: token::Dollar, span },
                         );
+                    } else {
+                        maybe_emit_macro_metavar_expr_feature(features, sess, span);
                     }
                     TokenTree::token(token::Dollar, span)
                 }