diff options
| author | bors <bors@rust-lang.org> | 2024-04-17 04:13:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-17 04:13:31 +0000 |
| commit | b7581490aaf964d4a34121d75be0fc49a2445911 (patch) | |
| tree | c63fb73c58309371cdaabf92c55d51a397d215d7 /compiler/rustc_parse/src | |
| parent | 803e33a4460c82581bd01d4008d0f44aef1ddfe8 (diff) | |
| parent | 854303b1f9082d92668c3800aa1ed63d7a19e830 (diff) | |
| download | rust-b7581490aaf964d4a34121d75be0fc49a2445911.tar.gz rust-b7581490aaf964d4a34121d75be0fc49a2445911.zip | |
Auto merge of #124055 - matthiaskrgr:rollup-waq2e68, r=matthiaskrgr
Rollup of 6 pull requests
Successful merges:
- #122813 (Qualifier tweaking)
- #122883 (refactor clippy in bootstrap)
- #123997 (Delay span bug when `Self` kw resolves to `DefKind::{Mod,Trait}`)
- #124045 (Reinstate nnethercote to the review rotation.)
- #124051 (Fix empty-set symbol in comments)
- #124052 (Make the comments for `ReturnDest` variants doc comments)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/item.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index b711ee9a8ee..8ae809f566b 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -1063,7 +1063,7 @@ impl<'a> Parser<'a> { /// Parses a `UseTreeKind::Nested(list)`. /// /// ```text - /// USE_TREE_LIST = Ø | (USE_TREE `,`)* USE_TREE [`,`] + /// USE_TREE_LIST = ∅ | (USE_TREE `,`)* USE_TREE [`,`] /// ``` fn parse_use_tree_list(&mut self) -> PResult<'a, ThinVec<(UseTree, ast::NodeId)>> { self.parse_delim_comma_seq(Delimiter::Brace, |p| { @@ -1968,11 +1968,8 @@ impl<'a> Parser<'a> { } else if matches!(is_raw, IdentIsRaw::No) && ident.is_reserved() { let snapshot = self.create_snapshot_for_diagnostic(); let err = if self.check_fn_front_matter(false, Case::Sensitive) { - let inherited_vis = Visibility { - span: rustc_span::DUMMY_SP, - kind: VisibilityKind::Inherited, - tokens: None, - }; + let inherited_vis = + Visibility { span: DUMMY_SP, kind: VisibilityKind::Inherited, tokens: None }; // We use `parse_fn` to get a span for the function let fn_parse_mode = FnParseMode { req_name: |_| true, req_body: true }; match self.parse_fn( |
