summary refs log tree commit diff
path: root/src/libsyntax/ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-12-16 08:42:40 +0000
committerbors <bors@rust-lang.org>2014-12-16 08:42:40 +0000
commit41f5907fa6b04614821277dd63172c5c8f11b6cd (patch)
tree0d01fe703bde512c2174b650808fbdccf0562f51 /src/libsyntax/ext
parentcdd8b5b5eac3551dcf17ab04888d5052bf870804 (diff)
parent1718cd6ee0f27ec8b7ad3038c1985a0acf0bebdb (diff)
downloadrust-41f5907fa6b04614821277dd63172c5c8f11b6cd.tar.gz
rust-41f5907fa6b04614821277dd63172c5c8f11b6cd.zip
auto merge of #19777 : nikomatsakis/rust/warn-on-shadowing, r=acrichto
per rfc 459
cc https://github.com/rust-lang/rust/issues/19390

One question is: should we start by warning, and only switch to hard error later? I think we discussed something like this in the meeting. 

r? @alexcrichton 
Diffstat (limited to 'src/libsyntax/ext')
-rw-r--r--src/libsyntax/ext/base.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 3c7a4a81d20..354b53bfc01 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -468,8 +468,8 @@ pub struct ExtCtxt<'a> {
 }
 
 impl<'a> ExtCtxt<'a> {
-    pub fn new<'a>(parse_sess: &'a parse::ParseSess, cfg: ast::CrateConfig,
-                   ecfg: expand::ExpansionConfig) -> ExtCtxt<'a> {
+    pub fn new(parse_sess: &'a parse::ParseSess, cfg: ast::CrateConfig,
+               ecfg: expand::ExpansionConfig) -> ExtCtxt<'a> {
         let env = initial_syntax_expander_table(&ecfg);
         ExtCtxt {
             parse_sess: parse_sess,