mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #13471 : Ryman/rust/feature_syntax_error, r=brson

Browse Source 
The current error message is misleading, it asks users to add `#[feature(..)]` which ends up being treated as an outer attribute, which then has no error unless `attribute_usage` lint is enforced. The code will still fail and the user might not understand why.
This commit is contained in:
bors 2014-04-13 08:51:49 -07:00
commit 7240fad25e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/front/feature_gate.rs
View File

@ -96,7 +96,7 @@ impl<'a> Context<'a> {
fn gate_feature(&self, feature: &str, span: Span, explain: &str) { fn gate_feature(&self, feature: &str, span: Span, explain: &str) {
if !self.has_feature(feature) { if !self.has_feature(feature) {
self.sess.span_err(span, explain); self.sess.span_err(span, explain);
self.sess.span_note(span, format!("add \\#[feature({})] to the \ self.sess.span_note(span, format!("add \\#![feature({})] to the \
crate attributes to enable", crate attributes to enable",
feature)); feature));
} }

2
src/librustc/middle/typeck/check/mod.rs
View File

@ -3698,7 +3698,7 @@ pub fn instantiate_path(fcx: &FnCtxt,
&& !fcx.tcx().sess.features.default_type_params.get() { && !fcx.tcx().sess.features.default_type_params.get() {
fcx.tcx().sess.span_err(pth.span, "default type parameters are \ fcx.tcx().sess.span_err(pth.span, "default type parameters are \
experimental and possibly buggy"); experimental and possibly buggy");
fcx.tcx().sess.span_note(pth.span, "add #[feature(default_type_params)] \ fcx.tcx().sess.span_note(pth.span, "add #![feature(default_type_params)] \
to the crate attributes to enable"); to the crate attributes to enable");
} }