OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #13652 : erickt/rust/master, r=alexcrichton

Browse Source
This commit is contained in:
bors 2014-04-21 00:01:35 -07:00
commit 1c101da29b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@
//! enabled.
//!
//! Features are enabled in programs via the crate-level attributes of
//! #[feature(...)] with a comma-separated list of features.
//! #![feature(...)] with a comma-separated list of features.
use middle::lint;
@ -324,7 +324,7 @@ pub fn check_crate(sess: &Session, krate: &ast::Crate) {
match attr.meta_item_list() {
None => {
sess.span_err(attr.span, "malformed feature attribute, \
expected #[feature(...)]");
expected #![feature(...)]");
}
Some(list) => {
for &mi in list.iter() {

2
src/librustc/middle/typeck/astconv.rs
View File

@ -219,7 +219,7 @@ fn ast_path_substs<AC:AstConv,RS:RegionScope>(
&& !this.tcx().sess.features.default_type_params.get() {
this.tcx().sess.span_err(path.span, "default type parameters are \
experimental and possibly buggy");
this.tcx().sess.span_note(path.span, "add #[feature(default_type_params)] \
this.tcx().sess.span_note(path.span, "add #![feature(default_type_params)] \
to the crate attributes to enable");
}