From 962d89a8d8bb192766abb1e27dffe02cb6423d64 Mon Sep 17 00:00:00 2001 From: David Hotham Date: Tue, 14 Nov 2023 17:26:00 +0000 Subject: [PATCH] fix error message for duplicate links --- src/cargo/core/resolver/errors.rs | 6 +++--- tests/testsuite/build_script.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cargo/core/resolver/errors.rs b/src/cargo/core/resolver/errors.rs index ae6c7fb8eec..f3e72c51bb1 100644 --- a/src/cargo/core/resolver/errors.rs +++ b/src/cargo/core/resolver/errors.rs @@ -140,9 +140,9 @@ pub(super) fn activation_error( msg.push_str("` as well:\n"); msg.push_str(&describe_path_in_context(cx, p)); msg.push_str("\nOnly one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. "); - msg.push_str("Try to adjust your dependencies so that only one package uses the links ='"); - msg.push_str(&*dep.package_name()); - msg.push_str("' value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links."); + msg.push_str("Try to adjust your dependencies so that only one package uses the `links = \""); + msg.push_str(link); + msg.push_str("\"` value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links."); } ConflictReason::MissingFeatures(features) => { msg.push_str("\n\nthe package `"); diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs index 408ce6457ad..f66c63dec60 100644 --- a/tests/testsuite/build_script.rs +++ b/tests/testsuite/build_script.rs @@ -1028,7 +1028,7 @@ versions that meet the requirements `*` are: 0.5.0 the package `a-sys` links to the native library `a`, but it conflicts with a previous package which links to `a` as well: package `foo v0.5.0 ([..])` -Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the links ='a-sys' value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. +Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the `links = \"a\"` value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. failed to select a version for `a-sys` which could resolve this conflict ").run(); @@ -1148,7 +1148,7 @@ versions that meet the requirements `*` are: 0.5.0 the package `a-sys` links to the native library `a`, but it conflicts with a previous package which links to `a` as well: package `foo v0.5.0 ([..])` -Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the links ='a-sys' value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. +Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the `links = \"a\"` value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. failed to select a version for `a-sys` which could resolve this conflict ").run(); @@ -4382,7 +4382,7 @@ versions that meet the requirements `*` are: 0.5.0 the package `a` links to the native library `a`, but it conflicts with a previous package which links to `a` as well: package `foo v0.5.0 ([..])` -Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the links ='a' value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. +Only one package in the dependency graph may specify the same links value. This helps ensure that only one copy of a native library is linked in the final binary. Try to adjust your dependencies so that only one package uses the `links = \"a\"` value. For more information, see https://doc.rust-lang.org/cargo/reference/resolver.html#links. failed to select a version for `a` which could resolve this conflict ").run();