From eaea188d9674c8b9eba36dec5f20277a6fe7ae43 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Thu, 2 Apr 2015 17:29:22 +0200 Subject: [PATCH] Do not suggest `#![feature(...)]` if we are in beta or stable channel. Fix #23973 --- src/libsyntax/feature_gate.rs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index dbddd9dd44d0..2d6fbb7c6835 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -409,6 +409,12 @@ impl<'a> Context<'a> { pub fn emit_feature_err(diag: &SpanHandler, feature: &str, span: Span, explain: &str) { diag.span_err(span, explain); + + // #23973: do not suggest `#![feature(...)]` if we are in beta/stable + match option_env!("CFG_RELEASE_CHANNEL") { + Some("stable") | Some("beta") => return, + _ => {} + } diag.fileline_help(span, &format!("add #![feature({})] to the \ crate attributes to enable", feature)); @@ -416,6 +422,12 @@ pub fn emit_feature_err(diag: &SpanHandler, feature: &str, span: Span, explain: pub fn emit_feature_warn(diag: &SpanHandler, feature: &str, span: Span, explain: &str) { diag.span_warn(span, explain); + + // #23973: do not suggest `#![feature(...)]` if we are in beta/stable + match option_env!("CFG_RELEASE_CHANNEL") { + Some("stable") | Some("beta") => return, + _ => {} + } if diag.handler.can_emit_warnings { diag.fileline_help(span, &format!("add #![feature({})] to the \ crate attributes to silence this warning",