Auto merge of #46803 - estebank:non-ascii-def-span, r=petrochenkov

Use def span for non-ascii ident feature gate error
rust-lang · Dec 27, 2017 · e8098c5 · e8098c5
2 parents cddc4a6 + 502d570
commit e8098c5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
@@ -1446,7 +1446,9 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
 
     fn visit_name(&mut self, sp: Span, name: ast::Name) {
         if !name.as_str().is_ascii() {
-            gate_feature_post!(&self, non_ascii_idents, sp,
+            gate_feature_post!(&self,
+                               non_ascii_idents,
+                               self.context.parse_sess.codemap().def_span(sp),
                                "non-ascii idents are not fully supported.");
         }
     }

diff --git a/src/test/ui/feature-gate-non_ascii_idents.stderr b/src/test/ui/feature-gate-non_ascii_idents.stderr
@@ -17,10 +17,8 @@ error: non-ascii idents are not fully supported. (see issue #28979)
 error: non-ascii idents are not fully supported. (see issue #28979)
   --> $DIR/feature-gate-non_ascii_idents.rs:15:1
    |
-15 | / mod föö { //~ ERROR non-ascii idents
-16 | |     pub fn bar() {}
-17 | | }
-   | |_^
+15 | mod föö { //~ ERROR non-ascii idents
+   | ^^^^^^^
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
@@ -65,10 +63,8 @@ error: non-ascii idents are not fully supported. (see issue #28979)
 error: non-ascii idents are not fully supported. (see issue #28979)
   --> $DIR/feature-gate-non_ascii_idents.rs:29:1
    |
-29 | / struct Föö { //~ ERROR non-ascii idents
-30 | |     föö: isize //~ ERROR non-ascii idents
-31 | | }
-   | |_^
+29 | struct Föö { //~ ERROR non-ascii idents
+   | ^^^^^^^^^^
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
@@ -83,22 +79,16 @@ error: non-ascii idents are not fully supported. (see issue #28979)
 error: non-ascii idents are not fully supported. (see issue #28979)
   --> $DIR/feature-gate-non_ascii_idents.rs:33:1
    |
-33 | / enum Bär { //~ ERROR non-ascii idents
-34 | |     Bäz { //~ ERROR non-ascii idents
-35 | |         qüx: isize //~ ERROR non-ascii idents
-36 | |     }
-37 | | }
-   | |_^
+33 | enum Bär { //~ ERROR non-ascii idents
+   | ^^^^^^^^
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable
 
 error: non-ascii idents are not fully supported. (see issue #28979)
   --> $DIR/feature-gate-non_ascii_idents.rs:34:5
    |
-34 | /     Bäz { //~ ERROR non-ascii idents
-35 | |         qüx: isize //~ ERROR non-ascii idents
-36 | |     }
-   | |_____^
+34 |     Bäz { //~ ERROR non-ascii idents
+   |     ^^^
    |
    = help: add #![feature(non_ascii_idents)] to the crate attributes to enable