Skip to content

Commit 5c427b4

Browse files
committed
reword message
1 parent b2e7ae1 commit 5c427b4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler/rustc_hir_typeck/src/method/suggest.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4062,7 +4062,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
40624062
let name = self.tcx.crate_name(trait_candidate.def_id.krate);
40634063
if trait_candidate.def_id.krate != item.def_id.krate && name == pick_name {
40644064
let msg = format!(
4065-
"you have multiple different versions of crate `{name}` in your \
4065+
"there are multiple different versions of crate `{name}` in the \
40664066
dependency graph",
40674067
);
40684068
let tdid = self.tcx.parent(item.def_id);

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1697,11 +1697,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
16971697
err.highlighted_span_help(
16981698
span,
16991699
vec![
1700-
StringPart::normal("you have ".to_string()),
1700+
StringPart::normal("there are ".to_string()),
17011701
StringPart::highlighted("multiple different versions".to_string()),
17021702
StringPart::normal(" of crate `".to_string()),
17031703
StringPart::highlighted(format!("{name}")),
1704-
StringPart::normal("` in your dependency graph".to_string()),
1704+
StringPart::normal("` the your dependency graph".to_string()),
17051705
],
17061706
);
17071707
let candidates = if impl_candidates.is_empty() {

tests/run-make/crate-loading/rmake.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main() {
1818
.extern_("dep_2_reexport", rust_lib_name("foo"))
1919
.run_fail()
2020
.assert_stderr_contains(
21-
"you have multiple different versions of crate `dependency` in your dependency graph",
21+
"there are multiple different versions of crate `dependency` in the dependency graph",
2222
)
2323
.assert_stderr_contains(
2424
"two types coming from two different versions of the same crate are different types \

0 commit comments

Comments
 (0)