about summary refs log tree commit diff
path: root/compiler/rustc_parse/src/parser
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-28 13:32:35 +0000
committerbors <bors@rust-lang.org>2022-07-28 13:32:35 +0000
commite5682615bb4fdb90e3a37b810a1b7bded2a1199e (patch)
tree5d60acbe5c761a5b59854a6277a42330f066b374 /compiler/rustc_parse/src/parser
parent05e678ccca974a8d0c26991083fb4cf8fff84e74 (diff)
parent71b0e95b8219e3a930e1009d4c4fbd1ea3799ce6 (diff)
downloadrust-e5682615bb4fdb90e3a37b810a1b7bded2a1199e.tar.gz
rust-e5682615bb4fdb90e3a37b810a1b7bded2a1199e.zip
Auto merge of #99849 - Dylan-DPC:rollup-1yfpplw, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #99714 (Fix regression introduced with #99383)
 - #99723 (Allow using stable os::fd::raw items through unstable os::wasi module)
 - #99810 (Fix settings slider on small width screens)
 - #99837 (Avoid `Symbol` to `String` conversions)
 - #99846 (Refactor `UnresolvedImportError`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
-rw-r--r--compiler/rustc_parse/src/parser/item.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs
index 87bc0d9762e..a14a7fc0610 100644
--- a/compiler/rustc_parse/src/parser/item.rs
+++ b/compiler/rustc_parse/src/parser/item.rs
@@ -1677,7 +1677,6 @@ impl<'a> Parser<'a> {
     }
 
     /// Is this a possibly malformed start of a `macro_rules! foo` item definition?
-
     fn is_macro_rules_item(&mut self) -> IsMacroRulesItem {
         if self.check_keyword(kw::MacroRules) {
             let macro_rules_span = self.token.span;