Skip to content

Commit c73b3d2

Browse files
estebankestebank
committed
Unify wording of resolve error
Remove "failed to resolve" and use the same format we use in other resolution errors "cannot find `name`". ``` error[E0433]: cannot find `nonexistent` in `existent` --> $DIR/custom_attr_multisegment_error.rs:5:13 | LL | #[existent::nonexistent] | ^^^^^^^^^^^ could not find `nonexistent` in `existent` ```
1 parent 3f6250a commit c73b3d2

249 files changed

Lines changed: 776 additions & 664 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎compiler/rustc_resolve/src/build_reduced_graph.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,15 @@ impl<'a, 'ra, 'tcx> BuildReducedGraphVisitor<'a, 'ra, 'tcx> {
469469
PathResult::NonModule(partial_res) => {
470470
expected_found_error(partial_res.expect_full_res())
471471
}
472-
PathResult::Failed { span, label, suggestion, .. } => {
473-
Err(VisResolutionError::FailedToResolve(span, label, suggestion))
474-
}
472+
PathResult::Failed {
473+
span, label, suggestion, message, segment_name, ..
474+
} => Err(VisResolutionError::FailedToResolve(
475+
span,
476+
segment_name,
477+
label,
478+
suggestion,
479+
message,
480+
)),
475481
PathResult::Indeterminate => Err(VisResolutionError::Indeterminate(path.span)),
476482
}
477483
}

‎compiler/rustc_resolve/src/diagnostics.rs‎

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -899,9 +899,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
899899
ResolutionError::SelfImportOnlyInImportListWithNonEmptyPrefix => {
900900
self.dcx().create_err(errs::SelfImportOnlyInImportListWithNonEmptyPrefix { span })
901901
}
902-
ResolutionError::FailedToResolve { segment, label, suggestion, module } => {
903-
let mut err =
904-
struct_span_code_err!(self.dcx(), span, E0433, "failed to resolve: {label}");
902+
ResolutionError::FailedToResolve { segment, label, suggestion, module, message } => {
903+
let mut err = struct_span_code_err!(self.dcx(), span, E0433, "{message}");
905904
err.span_label(span, label);
906905

907906
if let Some((suggestions, msg, applicability)) = suggestion {
@@ -912,13 +911,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
912911
err.multipart_suggestion(msg, suggestions, applicability);
913912
}
914913

915-
if let Some(segment) = segment {
916-
let module = match module {
917-
Some(ModuleOrUniformRoot::Module(m)) if let Some(id) = m.opt_def_id() => id,
918-
_ => CRATE_DEF_ID.to_def_id(),
919-
};
920-
self.find_cfg_stripped(&mut err, &segment, module);
921-
}
914+
let module = match module {
915+
Some(ModuleOrUniformRoot::Module(m)) if let Some(id) = m.opt_def_id() => id,
916+
_ => CRATE_DEF_ID.to_def_id(),
917+
};
918+
self.find_cfg_stripped(&mut err, &segment, module);
922919

923920
err
924921
}
@@ -1108,10 +1105,17 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
11081105
VisResolutionError::AncestorOnly(span) => {
11091106
self.dcx().create_err(errs::AncestorOnly(span))
11101107
}
1111-
VisResolutionError::FailedToResolve(span, label, suggestion) => self.into_struct_error(
1112-
span,
1113-
ResolutionError::FailedToResolve { segment: None, label, suggestion, module: None },
1114-
),
1108+
VisResolutionError::FailedToResolve(span, segment, label, suggestion, message) => self
1109+
.into_struct_error(
1110+
span,
1111+
ResolutionError::FailedToResolve {
1112+
segment,
1113+
label,
1114+
suggestion,
1115+
module: None,
1116+
message,
1117+
},
1118+
),
11151119
VisResolutionError::ExpectedFound(span, path_str, res) => {
11161120
self.dcx().create_err(errs::ExpectedModuleFound { span, res, path_str })
11171121
}
@@ -2438,13 +2442,25 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
24382442
failed_segment_idx: usize,
24392443
ident: Ident,
24402444
diag_metadata: Option<&DiagMetadata<'_>>,
2441-
) -> (String, Option<Suggestion>) {
2445+
) -> (String, String, Option<Suggestion>) {
24422446
let is_last = failed_segment_idx == path.len() - 1;
24432447
let ns = if is_last { opt_ns.unwrap_or(TypeNS) } else { TypeNS };
24442448
let module_res = match module {
24452449
Some(ModuleOrUniformRoot::Module(module)) => module.res(),
24462450
_ => None,
24472451
};
2452+
let scope = match &path[..failed_segment_idx] {
2453+
[.., prev] => {
2454+
if prev.ident.name == kw::PathRoot {
2455+
format!("the crate root")
2456+
} else {
2457+
format!("`{}`", prev.ident)
2458+
}
2459+
}
2460+
_ => format!("this scope"),
2461+
};
2462+
let message = format!("cannot find `{ident}` in {scope}");
2463+
24482464
if module_res == self.graph_root.res() {
24492465
let is_mod = |res| matches!(res, Res::Def(DefKind::Mod, _));
24502466
let mut candidates = self.lookup_import_candidates(ident, TypeNS, parent_scope, is_mod);
@@ -2462,6 +2478,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
24622478
Path { segments, span: Span::default(), tokens: None }
24632479
};
24642480
(
2481+
message,
24652482
String::from("unresolved import"),
24662483
Some((
24672484
vec![(ident.span, pprust::path_to_string(&path))],
@@ -2471,6 +2488,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
24712488
)
24722489
} else if ident.name == sym::core {
24732490
(
2491+
message,
24742492
format!("you might be missing crate `{ident}`"),
24752493
Some((
24762494
vec![(ident.span, "std".to_string())],
@@ -2479,9 +2497,14 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
24792497
)),
24802498
)
24812499
} else if ident.name == kw::Underscore {
2482-
(format!("`_` is not a valid crate or module name"), None)
2500+
(
2501+
"invalid crate or module name `_`".to_string(),
2502+
"`_` is not a valid crate or module name".to_string(),
2503+
None,
2504+
)
24832505
} else if self.tcx.sess.is_rust_2015() {
24842506
(
2507+
format!("cannot find module or crate `{ident}` in {scope}"),
24852508
format!("use of unresolved module or unlinked crate `{ident}`"),
24862509
Some((
24872510
vec![(
@@ -2490,8 +2513,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
24902513
)],
24912514
if was_invoked_from_cargo() {
24922515
format!(
2493-
"if you wanted to use a crate named `{ident}`, use `cargo add {ident}` \
2494-
to add it to your `Cargo.toml` and import it in your code",
2516+
"if you wanted to use a crate named `{ident}`, use `cargo add \
2517+
{ident}` to add it to your `Cargo.toml` and import it in your \
2518+
code",
24952519
)
24962520
} else {
24972521
format!(
@@ -2503,7 +2527,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
25032527
)),
25042528
)
25052529
} else {
2506-
(format!("could not find `{ident}` in the crate root"), None)
2530+
(message, format!("could not find `{ident}` in the crate root"), None)
25072531
}
25082532
} else if failed_segment_idx > 0 {
25092533
let parent = path[failed_segment_idx - 1].ident.name;
@@ -2569,15 +2593,16 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
25692593
);
25702594
};
25712595
}
2572-
(msg, None)
2596+
(message, msg, None)
25732597
} else if ident.name == kw::SelfUpper {
25742598
// As mentioned above, `opt_ns` being `None` indicates a module path in import.
25752599
// We can use this to improve a confusing error for, e.g. `use Self::Variant` in an
25762600
// impl
25772601
if opt_ns.is_none() {
2578-
("`Self` cannot be used in imports".to_string(), None)
2602+
(message, "`Self` cannot be used in imports".to_string(), None)
25792603
} else {
25802604
(
2605+
message,
25812606
"`Self` is only available in impls, traits, and type definitions".to_string(),
25822607
None,
25832608
)
@@ -2632,7 +2657,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
26322657
)
26332658
});
26342659

2635-
(format!("use of undeclared type `{ident}`"), suggestion)
2660+
let message = format!("cannot find type `{ident}` in {scope}");
2661+
(message, format!("use of undeclared type `{ident}`"), suggestion)
26362662
} else {
26372663
let mut suggestion = None;
26382664
if ident.name == sym::alloc {
@@ -2663,7 +2689,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
26632689
ignore_import,
26642690
) {
26652691
let descr = binding.res().descr();
2666-
(format!("{descr} `{ident}` is not a crate or module"), suggestion)
2692+
let message = format!("cannot find module or crate `{ident}` in {scope}");
2693+
(message, format!("{descr} `{ident}` is not a crate or module"), suggestion)
26672694
} else {
26682695
let suggestion = if suggestion.is_some() {
26692696
suggestion
@@ -2685,7 +2712,12 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
26852712
Applicability::MaybeIncorrect,
26862713
))
26872714
};
2688-
(format!("use of unresolved module or unlinked crate `{ident}`"), suggestion)
2715+
let message = format!("cannot find module or crate `{ident}` in {scope}");
2716+
(
2717+
message,
2718+
format!("use of unresolved module or unlinked crate `{ident}`"),
2719+
suggestion,
2720+
)
26892721
}
26902722
}
26912723
}

‎compiler/rustc_resolve/src/ident.rs‎

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,7 +1775,13 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
17751775
finalize.is_some(),
17761776
module_had_parse_errors,
17771777
module,
1778-
|| ("there are too many leading `super` keywords".to_string(), None),
1778+
|| {
1779+
(
1780+
"too many leading `super` keywords".to_string(),
1781+
"there are too many leading `super` keywords".to_string(),
1782+
None,
1783+
)
1784+
},
17791785
);
17801786
}
17811787
if segment_idx == 0 {
@@ -1823,16 +1829,24 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
18231829
module,
18241830
|| {
18251831
let name_str = if name == kw::PathRoot {
1826-
"crate root".to_string()
1832+
"the crate root".to_string()
18271833
} else {
18281834
format!("`{name}`")
18291835
};
1830-
let label = if segment_idx == 1 && path[0].ident.name == kw::PathRoot {
1831-
format!("global paths cannot start with {name_str}")
1836+
let (message, label) = if segment_idx == 1
1837+
&& path[0].ident.name == kw::PathRoot
1838+
{
1839+
(
1840+
format!("global paths cannot start with {name_str}"),
1841+
"cannot start with this".to_string(),
1842+
)
18321843
} else {
1833-
format!("{name_str} in paths can only be used in start position")
1844+
(
1845+
format!("{name_str} in paths can only be used in start position"),
1846+
"can only be used in path start position".to_string(),
1847+
)
18341848
};
1835-
(label, None)
1849+
(message, label, None)
18361850
},
18371851
);
18381852
}
@@ -1948,7 +1962,20 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
19481962
res.article(),
19491963
res.descr()
19501964
);
1951-
(label, None)
1965+
let scope = match &path[..segment_idx] {
1966+
[.., prev] => {
1967+
if prev.ident.name == kw::PathRoot {
1968+
format!("the crate root")
1969+
} else {
1970+
format!("`{}`", prev.ident)
1971+
}
1972+
}
1973+
_ => format!("this scope"),
1974+
};
1975+
// FIXME: reword, as the reason we expected a module is because of
1976+
// the following path segment.
1977+
let message = format!("cannot find module `{ident}` in {scope}");
1978+
(message, label, None)
19521979
},
19531980
);
19541981
}

‎compiler/rustc_resolve/src/imports.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,16 +1042,18 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
10421042
suggestion,
10431043
module,
10441044
error_implied_by_parse_error: _,
1045+
message,
10451046
} => {
10461047
if no_ambiguity {
10471048
assert!(import.imported_module.get().is_none());
10481049
self.report_error(
10491050
span,
10501051
ResolutionError::FailedToResolve {
1051-
segment: Some(segment_name),
1052+
segment: segment_name,
10521053
label,
10531054
suggestion,
10541055
module,
1056+
message,
10551057
},
10561058
);
10571059
}

‎compiler/rustc_resolve/src/late.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4890,14 +4890,16 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
48904890
module,
48914891
segment_name,
48924892
error_implied_by_parse_error: _,
4893+
message,
48934894
} => {
48944895
return Err(respan(
48954896
span,
48964897
ResolutionError::FailedToResolve {
4897-
segment: Some(segment_name),
4898+
segment: segment_name,
48984899
label,
48994900
suggestion,
49004901
module,
4902+
message,
49014903
},
49024904
));
49034905
}

‎compiler/rustc_resolve/src/lib.rs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,11 @@ enum ResolutionError<'ra> {
280280
SelfImportOnlyInImportListWithNonEmptyPrefix,
281281
/// Error E0433: failed to resolve.
282282
FailedToResolve {
283-
segment: Option<Symbol>,
283+
segment: Symbol,
284284
label: String,
285285
suggestion: Option<Suggestion>,
286286
module: Option<ModuleOrUniformRoot<'ra>>,
287+
message: String,
287288
},
288289
/// Error E0434: can't capture dynamic environment in a fn item.
289290
CannotCaptureDynamicEnvironmentInFnItem,
@@ -342,7 +343,7 @@ enum ResolutionError<'ra> {
342343
enum VisResolutionError<'a> {
343344
Relative2018(Span, &'a ast::Path),
344345
AncestorOnly(Span),
345-
FailedToResolve(Span, String, Option<Suggestion>),
346+
FailedToResolve(Span, Symbol, String, Option<Suggestion>, String),
346347
ExpectedFound(Span, String, Res),
347348
Indeterminate(Span),
348349
ModuleOnly(Span),
@@ -486,6 +487,7 @@ enum PathResult<'ra> {
486487
/// The segment name of target
487488
segment_name: Symbol,
488489
error_implied_by_parse_error: bool,
490+
message: String,
489491
},
490492
}
491493

@@ -496,10 +498,14 @@ impl<'ra> PathResult<'ra> {
496498
finalize: bool,
497499
error_implied_by_parse_error: bool,
498500
module: Option<ModuleOrUniformRoot<'ra>>,
499-
label_and_suggestion: impl FnOnce() -> (String, Option<Suggestion>),
501+
label_and_suggestion: impl FnOnce() -> (String, String, Option<Suggestion>),
500502
) -> PathResult<'ra> {
501-
let (label, suggestion) =
502-
if finalize { label_and_suggestion() } else { (String::new(), None) };
503+
let (message, label, suggestion) = if finalize {
504+
label_and_suggestion()
505+
} else {
506+
// FIXME: this output isn't actually present in the test suite.
507+
(format!("cannot find `{ident}` in this scope"), String::new(), None)
508+
};
503509
PathResult::Failed {
504510
span: ident.span,
505511
segment_name: ident.name,
@@ -508,6 +514,7 @@ impl<'ra> PathResult<'ra> {
508514
is_error_from_last_segment,
509515
module,
510516
error_implied_by_parse_error,
517+
message,
511518
}
512519
}
513520
}

0 commit comments

Comments
 (0)