bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Auto merge of #41345 - frewsxcv:rollup, r=frewsxcv

Browse source 
Rollup of 3 pull requests

- Successful merges: #41012, #41280, #41290
- Failed merges:
This commit is contained in:
bors 2017-04-17 17:56:29 +00:00
commit 5516bcc458
24 changed files with 742 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/parse/parser.rs
View file

@ -5056,7 +5056,9 @@ impl<'a> Parser<'a> {
/// and `pub(super)` for `pub(in super)`. If the following element can't be a tuple (i.e. it's
/// a function definition, it's not a tuple struct field) and the contents within the parens
/// isn't valid, emit a proper diagnostic.
fn parse_visibility(&mut self, can_take_tuple: bool) -> PResult<'a, Visibility> {
pub fn parse_visibility(&mut self, can_take_tuple: bool) -> PResult<'a, Visibility> {
maybe_whole!(self, NtVis, |x| x);
if !self.eat_keyword(keywords::Pub) {
return Ok(Visibility::Inherited)
}