Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 13 pull requests #56451

Merged
merged 31 commits into from
Dec 3, 2018
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
0591ff7
OsString: mention storage form in discussion
jnqnfe Nov 10, 2018
a1e9c7f
OsStr: clarify `len()` method documentation
jnqnfe Nov 10, 2018
aa5a4ef
Removed feature gate.
alexreg Nov 30, 2018
7bc1255
Removed chapter from Unstable Book.
alexreg Nov 30, 2018
d609fdf
Updated ui tests.
alexreg Nov 30, 2018
f4cde5b
stabilize std::dbg!(...)
Centril Dec 1, 2018
4c2c523
Move VecDeque::resize_with out of the impl<T:Clone> block
scottmcm Dec 1, 2018
a3b7a21
Improve the unstable book example for `#[marker]`
scottmcm Dec 1, 2018
df0ab06
Update tracking issue for `extern_crate_self`
petrochenkov Dec 1, 2018
08a6cf3
Remove unneeded body class selector
GuillaumeGomez Dec 1, 2018
12c9b79
Fix failing tidy (line endings on Windows)
petrochenkov Dec 1, 2018
e7e9692
remove some uses of try!
mark-i-m Dec 1, 2018
1e18cc9
Update issue number of `shrink_to` methods to point the tracking issue
ordovicia Dec 2, 2018
70371fd
Add description about `crate` for parse_visibility's comment
yui-knk Dec 2, 2018
172ec72
Fix "line longer than 100 chars"
yui-knk Dec 2, 2018
d605e1d
explicitly control compiler_builts/c feature from libstd
RalfJung Dec 2, 2018
bd20718
make the C part of compiler-builtins opt-out
RalfJung Dec 2, 2018
96bf06b
Remove not used `DotEq` token
yui-knk Dec 2, 2018
e9a8055
Rollup merge of #56141 - jnqnfe:osstr_len_clarity, r=nagisa
kennytm Dec 3, 2018
bf96a7b
Rollup merge of #56366 - alexreg:stabilise-self_in_typedefs, r=Centril
kennytm Dec 3, 2018
441aaf8
Rollup merge of #56395 - Centril:stabilize-dbg-macro, r=SimonSapin
kennytm Dec 3, 2018
2cbcd36
Rollup merge of #56401 - scottmcm:vecdeque-resize-with, r=dtolnay
kennytm Dec 3, 2018
65e6702
Rollup merge of #56402 - scottmcm:better-marker-trait-example, r=Centril
kennytm Dec 3, 2018
81752fd
Rollup merge of #56412 - petrochenkov:extself, r=Centril
kennytm Dec 3, 2018
17f6fc7
Rollup merge of #56416 - GuillaumeGomez:css-body, r=QuietMisdreavus
kennytm Dec 3, 2018
71d76be
Rollup merge of #56418 - petrochenkov:wintidy, r=nagisa
kennytm Dec 3, 2018
ca98bce
Rollup merge of #56419 - mark-i-m:remove-try, r=Centril
kennytm Dec 3, 2018
52a4fc8
Rollup merge of #56432 - ordovicia:shrink-to-issue, r=Centril
kennytm Dec 3, 2018
a498a6d
Rollup merge of #56433 - yui-knk:update_comment_of_parse_visibility, …
kennytm Dec 3, 2018
21433f2
Rollup merge of #56435 - RalfJung:libstd-without-c, r=alexcrichton
kennytm Dec 3, 2018
ac363d8
Rollup merge of #56438 - yui-knk:remove_not_used_DotEq_token, r=petro…
kennytm Dec 3, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
@@ -6282,9 +6282,10 @@ impl<'a> Parser<'a> {
self.parse_single_struct_field(lo, vis, attrs)
}

/// Parse `pub`, `pub(crate)` and `pub(in path)` plus shortcuts `crate` for `pub(crate)`, `pub(self)` for `pub(in self)`
/// 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
/// Parse `pub`, `pub(crate)` and `pub(in path)` plus shortcuts `crate` for `pub(crate)`,
/// `pub(self)` for `pub(in self)` 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.
pub fn parse_visibility(&mut self, can_take_tuple: bool) -> PResult<'a, Visibility> {
maybe_whole!(self, NtVis, |x| x);