From 73bde2f0ce38c57255840dd879ec10475ef44f2c Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Thu, 31 Oct 2019 18:25:40 +0200 Subject: [PATCH] Revert "pre-expansion gate label_break_value" This reverts commit 137ded8ab1edf5112c45e0b6854272ae2e9d3a6d. --- src/libsyntax/feature_gate/check.rs | 6 ++++++ src/test/ui/feature-gates/feature-gate-label_break_value.rs | 5 +---- .../ui/feature-gates/feature-gate-label_break_value.stderr | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs index d924cb608f87..1846ba5ed7be 100644 --- a/src/libsyntax/feature_gate/check.rs +++ b/src/libsyntax/feature_gate/check.rs @@ -518,6 +518,12 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> { "type ascription is experimental"); } } + ast::ExprKind::Block(_, opt_label) => { + if let Some(label) = opt_label { + gate_feature_post!(&self, label_break_value, label.ident.span, + "labels on blocks are unstable"); + } + } _ => {} } visit::walk_expr(self, e) diff --git a/src/test/ui/feature-gates/feature-gate-label_break_value.rs b/src/test/ui/feature-gates/feature-gate-label_break_value.rs index 8d7ecd27b450..6fc38f45517e 100644 --- a/src/test/ui/feature-gates/feature-gate-label_break_value.rs +++ b/src/test/ui/feature-gates/feature-gate-label_break_value.rs @@ -1,8 +1,5 @@ -#[cfg(FALSE)] -pub fn foo() { +pub fn main() { 'a: { //~ ERROR labels on blocks are unstable break 'a; } } - -fn main() {} diff --git a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr index 6a861d3e04f9..a417e0eec22f 100644 --- a/src/test/ui/feature-gates/feature-gate-label_break_value.stderr +++ b/src/test/ui/feature-gates/feature-gate-label_break_value.stderr @@ -1,5 +1,5 @@ error[E0658]: labels on blocks are unstable - --> $DIR/feature-gate-label_break_value.rs:3:5 + --> $DIR/feature-gate-label_break_value.rs:2:5 | LL | 'a: { | ^^