Avoid 'duplicate package' warnings when depending on cbindgen via git

When specifying `cbindgen` as a dependency via git, several 'skipping duplicate package' warnings pop up regarding some of the test crates. The warning seems to be spurious given that the test packages aren't needed when depending on `cbindgen` (see rust-lang/cargo#10752), but while a fix is being considered for Cargo, this commit disambiguates the duplicated package names by referring to their relative paths.
mozilla · May 31, 2023 · 6165bbf · 6165bbf
1 parent c8546ad
commit 6165bbf
Show file tree

Hide file tree

Showing 25 changed files with 56 additions and 46 deletions.
diff --git a/tests/rust/dep_v2/Cargo.lock b/tests/rust/dep_v2/Cargo.lock
diff --git a/tests/rust/dep_v2/Cargo.toml b/tests/rust/dep_v2/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "expand-dep"
+name = "dep-2"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
 
 [dependencies]
-dep = { path = "dep" }
+dep-2-dep = { path = "dep" }
diff --git a/tests/rust/dep_v2/cbindgen.toml b/tests/rust/dep_v2/cbindgen.toml
@@ -1,3 +1,3 @@
 [parse]
 parse_deps = true
-include = ["dep"]
+include = ["dep-2-dep"]
diff --git a/tests/rust/dep_v2/dep/Cargo.toml b/tests/rust/dep_v2/dep/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "dep-2-dep"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"

diff --git a/tests/rust/dep_v2/src/lib.rs b/tests/rust/dep_v2/src/lib.rs
@@ -1,4 +1,4 @@
-use dep::dep_struct;
+use dep_2_dep::dep_struct;
 
 #[no_mangle]
 pub unsafe extern "C" fn get_x(dep_struct: *const dep_struct) -> u32 {

diff --git a/tests/rust/expand_default_features/Cargo.lock b/tests/rust/expand_default_features/Cargo.lock
diff --git a/tests/rust/expand_default_features/Cargo.toml b/tests/rust/expand_default_features/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-default-features"
 version = "0.1.0"
 authors = ["cbindgen"]
 

diff --git a/tests/rust/expand_default_features/cbindgen.toml b/tests/rust/expand_default_features/cbindgen.toml
@@ -1,5 +1,5 @@
 [parse]
 parse_deps = false
 [parse.expand]
-crates = ["expand"]
+crates = ["expand-default-features"]
 all_features = false
diff --git a/tests/rust/expand_dep_v2/Cargo.lock b/tests/rust/expand_dep_v2/Cargo.lock
diff --git a/tests/rust/expand_dep_v2/Cargo.toml b/tests/rust/expand_dep_v2/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2018"
 
 [dependencies]
 expand-dep = { path = "../expand_dep" }
-dep = { path = "dep_v2" }
+expand-dep-2-dep-2 = { path = "dep_v2" }
diff --git a/tests/rust/expand_dep_v2/dep/Cargo.toml b/tests/rust/expand_dep_v2/dep/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "expand-dep-2-dep"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"

diff --git a/tests/rust/expand_dep_v2/dep_v2/Cargo.toml b/tests/rust/expand_dep_v2/dep_v2/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "expand-dep-2-dep-2"
 version = "0.2.0"
 authors = ["cbindgen"]
 edition = "2018"

diff --git a/tests/rust/expand_features/Cargo.lock b/tests/rust/expand_features/Cargo.lock
diff --git a/tests/rust/expand_features/Cargo.toml b/tests/rust/expand_features/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-features"
 version = "0.1.0"
 authors = ["cbindgen"]
 

diff --git a/tests/rust/expand_no_default_features/Cargo.lock b/tests/rust/expand_no_default_features/Cargo.lock
diff --git a/tests/rust/expand_no_default_features/Cargo.toml b/tests/rust/expand_no_default_features/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-no-default-features"
 version = "0.1.0"
 authors = ["cbindgen"]
 

diff --git a/tests/rust/expand_no_default_features/cbindgen.toml b/tests/rust/expand_no_default_features/cbindgen.toml
@@ -1,5 +1,5 @@
 [parse]
 parse_deps = false
 [parse.expand]
-crates = ["expand"]
+crates = ["expand-no-default-features"]
 default_features = false
diff --git a/tests/rust/external_workspace_child/Cargo.toml b/tests/rust/external_workspace_child/Cargo.toml
@@ -4,5 +4,5 @@ version = "0.1.0"
 authors = ["cbindgen"]
 workspace = "../workspace"
 
-[dependencies.dep]
+[dependencies.workspace-dep]
 path = "../workspace/dep"
diff --git a/tests/rust/external_workspace_child/src/lib.rs b/tests/rust/external_workspace_child/src/lib.rs
@@ -1,4 +1,4 @@
-extern crate dep;
+extern crate workspace_dep;
 
 #[no_mangle]
 pub extern "C" fn consume_ext(_ext: dep::ExtType) {

diff --git a/tests/rust/literal_target/Cargo.lock b/tests/rust/literal_target/Cargo.lock
diff --git a/tests/rust/literal_target/Cargo.toml b/tests/rust/literal_target/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.1.0"
 authors = ["cbindgen"]
 
 [target.x86_64-pc-windows-gnu.dependencies]
-dep = { path = "../workspace/dep" }
+workspace-dep = { path = "../workspace/dep" }
diff --git a/tests/rust/workspace/Cargo.lock b/tests/rust/workspace/Cargo.lock
diff --git a/tests/rust/workspace/Cargo.toml b/tests/rust/workspace/Cargo.toml
@@ -3,7 +3,7 @@ name = "workspace"
 version = "0.1.0"
 authors = ["cbindgen"]
 
-[dependencies.dep]
+[dependencies.workspace-dep]
 path = "dep"
 
 [workspace]

diff --git a/tests/rust/workspace/cbindgen.toml b/tests/rust/workspace/cbindgen.toml
@@ -1,3 +1,3 @@
 [parse]
 parse_deps = true
-extra_bindings = ["dep"]
+extra_bindings = ["workspace-dep"]
diff --git a/tests/rust/workspace/dep/Cargo.toml b/tests/rust/workspace/dep/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "workspace-dep"
 version = "0.1.0"
 authors = ["cbindgen"]