itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #12868 - hi-rustin:rustin-patch-install, r=weihanglo

Browse Source 
Remove duplicate binaries during install
This commit is contained in:
bors 2023-10-27 01:28:20 +00:00
commit fcc3786d73
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/cargo/commands/install.rs
View File

@ -9,6 +9,7 @@ use cargo::util::IntoUrl;
use cargo::util::ToSemver; use cargo::util::ToSemver;
use cargo::util::VersionReqExt; use cargo::util::VersionReqExt;
use cargo::CargoResult; use cargo::CargoResult;
use itertools::Itertools;
use semver::VersionReq; use semver::VersionReq;
use cargo_util::paths; use cargo_util::paths;
@ -119,6 +120,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
.get_many::<CrateVersion>("crate") .get_many::<CrateVersion>("crate")
.unwrap_or_default() .unwrap_or_default()
.cloned() .cloned()
.dedup_by(|x, y| x == y)
.map(|(krate, local_version)| resolve_crate(krate, local_version, version)) .map(|(krate, local_version)| resolve_crate(krate, local_version, version))
.collect::<crate::CargoResult<Vec<_>>>()?; .collect::<crate::CargoResult<Vec<_>>>()?;

22
tests/testsuite/install.rs
View File

@ -57,6 +57,28 @@ fn simple() {
assert_has_not_installed_exe(cargo_home(), "foo"); assert_has_not_installed_exe(cargo_home(), "foo");
} }
#[cargo_test]
fn install_the_same_version_twice() {
pkg("foo", "0.0.1");
cargo_process("install foo foo")
.with_stderr(
"\
[UPDATING] `[..]` index
[DOWNLOADING] crates ...
[DOWNLOADED] foo v0.0.1 (registry [..])
[INSTALLING] foo v0.0.1
[COMPILING] foo v0.0.1
[FINISHED] release [optimized] target(s) in [..]
[INSTALLING] [CWD]/home/.cargo/bin/foo[EXE]
[INSTALLED] package `foo v0.0.1` (executable `foo[EXE]`)
[WARNING] be sure to add `[..]` to your PATH to be able to run the installed binaries
",
)
.run();
assert_has_installed_exe(cargo_home(), "foo");
}
#[cargo_test] #[cargo_test]
fn toolchain() { fn toolchain() {
pkg("foo", "0.0.1"); pkg("foo", "0.0.1");