diff options
| author | Zack M. Davis <code@zackmdavis.net> | 2017-10-19 14:43:47 -0700 |
|---|---|---|
| committer | Zack M. Davis <code@zackmdavis.net> | 2017-10-22 23:58:13 -0700 |
| commit | 214b0f229395d4460cbcccf17d07cf687ff83b0a (patch) | |
| tree | 1c89764c9ee401c47f1be752002804d4ba94f8cb /src/libsyntax/parse | |
| parent | 4c053db233d69519b548e5b8ed7192d0783e582a (diff) | |
| download | rust-214b0f229395d4460cbcccf17d07cf687ff83b0a.tar.gz rust-214b0f229395d4460cbcccf17d07cf687ff83b0a.zip | |
`crate` shorthand visibility modifier
With regrets, this breaks rustfmt and rls. This is in the matter of #45388.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 8fd2bad4e44..c9e9a8edcb8 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -36,7 +36,7 @@ use ast::SelfKind; use ast::{TraitItem, TraitRef, TraitObjectSyntax}; use ast::{Ty, TyKind, TypeBinding, TyParam, TyParamBounds}; use ast::{ViewPath, ViewPathGlob, ViewPathList, ViewPathSimple}; -use ast::{Visibility, WhereClause}; +use ast::{Visibility, WhereClause, CrateSugar}; use ast::{BinOpKind, UnOp}; use ast::{RangeEnd, RangeSyntax}; use {ast, attr}; @@ -5325,6 +5325,10 @@ impl<'a> Parser<'a> { pub fn parse_visibility(&mut self, can_take_tuple: bool) -> PResult<'a, Visibility> { maybe_whole!(self, NtVis, |x| x); + if self.eat_keyword(keywords::Crate) { + return Ok(Visibility::Crate(self.prev_span, CrateSugar::JustCrate)); + } + if !self.eat_keyword(keywords::Pub) { return Ok(Visibility::Inherited) } @@ -5338,7 +5342,7 @@ impl<'a> Parser<'a> { // `pub(crate)` self.bump(); // `(` self.bump(); // `crate` - let vis = Visibility::Crate(self.prev_span); + let vis = Visibility::Crate(self.prev_span, CrateSugar::PubCrate); self.expect(&token::CloseDelim(token::Paren))?; // `)` return Ok(vis) } else if self.look_ahead(1, |t| t.is_keyword(keywords::In)) { |
