Auto merge of #104236 - compiler-errors:rollup-adjshd6, r=compiler-errors
Rollup of 9 pull requests Successful merges: - #102763 (Some diagnostic-related nits) - #103443 (Parser: Recover from using colon as path separator in imports) - #103675 (remove redundent "<>" for ty::Slice with reference type) - #104046 (bootstrap: add support for running Miri on a file) - #104115 (Migrate crate-search element to CSS variables) - #104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - #104201 (Add check in GUI test for file loading failure) - #104211 (⬆️ rust-analyzer) - #104231 (Update mailmap) Failed merges: - #104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
01a6f30324
108 changed files with 1633 additions and 563 deletions
|
@ -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)
|
||||
}
|
||||
};
|
||||
|
|
|
@ -401,7 +401,7 @@ impl<'a> Parser<'a> {
|
|||
.span_suggestions(
|
||||
span.shrink_to_hi(),
|
||||
"add `mut` or `const` here",
|
||||
["mut ".to_string(), "const ".to_string()].into_iter(),
|
||||
["mut ".to_string(), "const ".to_string()],
|
||||
Applicability::HasPlaceholders,
|
||||
)
|
||||
.emit();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue