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

Parser: Recover from using colon as path separator in imports #103443

Merged
merged 1 commit into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions compiler/rustc_parse/src/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -971,6 +971,23 @@ impl<'a> Parser<'a> {
if self.eat(&token::ModSep) {
self.parse_use_tree_glob_or_nested()?
} else {
// Recover from using a colon as path separator.
while self.eat_noexpect(&token::Colon) {
self.struct_span_err(self.prev_token.span, "expected `::`, found `:`")
.span_suggestion_short(
self.prev_token.span,
"use double colon",
"::",
Applicability::MachineApplicable,
)
.note_once("import paths are delimited using `::`")
.emit();

// We parse the rest of the path and append it to the original prefix.
self.parse_path_segments(&mut prefix.segments, PathStyle::Mod, None)?;
prefix.span = lo.to(self.prev_token.span);
}

UseTreeKind::Simple(self.parse_rename()?, DUMMY_NODE_ID, DUMMY_NODE_ID)
}
};
Expand Down
11 changes: 11 additions & 0 deletions src/test/ui/parser/use-colon-as-mod-sep.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Recover from using a colon as a path separator.

use std::process:Command;
//~^ ERROR expected `::`, found `:`
use std:fs::File;
//~^ ERROR expected `::`, found `:`
use std:collections:HashMap;
//~^ ERROR expected `::`, found `:`
//~| ERROR expected `::`, found `:`

fn main() { }
28 changes: 28 additions & 0 deletions src/test/ui/parser/use-colon-as-mod-sep.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
error: expected `::`, found `:`
--> $DIR/use-colon-as-mod-sep.rs:3:17
|
LL | use std::process:Command;
| ^ help: use double colon
|
= note: import paths are delimited using `::`

error: expected `::`, found `:`
--> $DIR/use-colon-as-mod-sep.rs:5:8
|
LL | use std:fs::File;
| ^ help: use double colon

error: expected `::`, found `:`
--> $DIR/use-colon-as-mod-sep.rs:7:8
|
LL | use std:collections:HashMap;
| ^ help: use double colon

error: expected `::`, found `:`
--> $DIR/use-colon-as-mod-sep.rs:7:20
|
LL | use std:collections:HashMap;
| ^ help: use double colon

error: aborting due to 4 previous errors