diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 539d594cb8be2..6cfa6c0570134 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3395,7 +3395,10 @@ impl<'a> Parser<'a> { /// Parse a structure field fn parse_name_and_ty(&mut self, pr: Visibility, attrs: Vec ) -> PResult { - let lo = self.span.lo; + let lo = match pr { + Inherited => self.span.lo, + Public => self.last_span.lo, + }; if !self.token.is_plain_ident() { return Err(self.fatal("expected ident")); } diff --git a/src/test/compile-fail/pub-struct-field-span-26083.rs b/src/test/compile-fail/pub-struct-field-span-26083.rs new file mode 100644 index 0000000000000..0dc7e09f0e4db --- /dev/null +++ b/src/test/compile-fail/pub-struct-field-span-26083.rs @@ -0,0 +1,30 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Regression test for issue #26083 +// Test that span for public struct fields start at `pub` instead of the identifier + +struct Foo { + pub bar: u8, + + pub + //~^ error: field `bar` is already declared [E0124] + bar: u8, + + pub bar: + //~^ error: field `bar` is already declared [E0124] + u8, + + bar: + //~^ error: field `bar` is already declared [E0124] + u8, +} + +fn main() { }