diff options
| author | bors <bors@rust-lang.org> | 2022-08-06 15:09:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-06 15:09:59 +0000 |
| commit | 5c54be35c63a883d5114cdbc50e07194e5cece0f (patch) | |
| tree | e53022b20d73d8044fb1e2df52f79f67ed027e53 /compiler/rustc_parse/src/parser | |
| parent | 76b04847400effd127ced322d5627c0c1aec2998 (diff) | |
| parent | 811b0368aab849fb53f66e7ce7bec7a56e4c2f8a (diff) | |
| download | rust-5c54be35c63a883d5114cdbc50e07194e5cece0f.tar.gz rust-5c54be35c63a883d5114cdbc50e07194e5cece0f.zip | |
Auto merge of #100195 - matthiaskrgr:rollup-ovzyyb0, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #100094 (Detect type mismatch due to loop that might never iterate) - #100132 (Use (actually) dummy place for let-else divergence) - #100167 (Recover `require`, `include` instead of `use` in item) - #100193 (Remove more Clean trait implementations) 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.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index fb92ce41252..72c23776d33 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -271,7 +271,10 @@ impl<'a> Parser<'a> { // MACRO_RULES ITEM self.parse_item_macro_rules(vis, has_bang)? } else if self.isnt_macro_invocation() - && (self.token.is_ident_named(sym::import) || self.token.is_ident_named(sym::using)) + && (self.token.is_ident_named(sym::import) + || self.token.is_ident_named(sym::using) + || self.token.is_ident_named(sym::include) + || self.token.is_ident_named(sym::require)) { return self.recover_import_as_use(); } else if self.isnt_macro_invocation() && vis.kind.is_pub() { |