Skip to content

Commit 92f08dd

Browse files
committed
reword message
1 parent 70e2b5b commit 92f08dd

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
@@ -4063,7 +4063,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
40634063
let name = self.tcx.crate_name(trait_candidate.def_id.krate);
40644064
if trait_candidate.def_id.krate != item.def_id.krate && name == pick_name {
40654065
let msg = format!(
4066-
"you have multiple different versions of crate `{name}` in your \
4066+
"there are multiple different versions of crate `{name}` in the \
40674067
dependency graph",
40684068
);
40694069
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
@@ -1698,11 +1698,11 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
16981698
err.highlighted_span_help(
16991699
span,
17001700
vec![
1701-
StringPart::normal("you have ".to_string()),
1701+
StringPart::normal("there are ".to_string()),
17021702
StringPart::highlighted("multiple different versions".to_string()),
17031703
StringPart::normal(" of crate `".to_string()),
17041704
StringPart::highlighted(format!("{name}")),
1705-
StringPart::normal("` in your dependency graph".to_string()),
1705+
StringPart::normal("` the your dependency graph".to_string()),
17061706
],
17071707
);
17081708
let candidates = if impl_candidates.is_empty() {

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

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

0 commit comments

Comments
 (0)