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 https://github.com/rust-lang/cargo/issues/10752), but while a fix is being considered for Cargo, this commit disambiguates the duplicated package names by referring to their relative paths.
2023-04-13 10:32:05 +02:00
parent c8546ad42d
commit 6165bbf021
25 changed files with 59 additions and 49 deletions
@@ -1,12 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "dep"
-version = "0.1.0"
+version = 3

 [[package]]
-name = "expand-dep"
+name = "dep-2"
 version = "0.1.0"
 dependencies = [
- "dep",
+ "dep-2-dep",
 ]
+
+[[package]]
+name = "dep-2-dep"
+version = "0.1.0"
@@ -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" }
@@ -1,3 +1,3 @@
 [parse]
 parse_deps = true
-include = ["dep"]
+include = ["dep-2-dep"]
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "dep-2-dep"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
@@ -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 {
@@ -1,6 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "expand"
-version = "0.1.0"
+version = 3

+[[package]]
+name = "expand-default-features"
+version = "0.1.0"
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-default-features"
 version = "0.1.0"
 authors = ["cbindgen"]

@@ -1,5 +1,5 @@
 [parse]
 parse_deps = false
 [parse.expand]
-crates = ["expand"]
+crates = ["expand-default-features"]
 all_features = false
@@ -1,24 +1,26 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "dep"
-version = "0.1.0"
+version = 3

 [[package]]
 name = "dep"
-version = "0.2.0"
+version = "0.1.0"

 [[package]]
 name = "expand-dep"
 version = "0.1.0"
 dependencies = [
- "dep 0.1.0",
+ "dep",
 ]

 [[package]]
 name = "expand-dep-2"
 version = "0.2.0"
 dependencies = [
- "dep 0.2.0",
 "expand-dep",
+ "expand-dep-2-dep-2",
 ]
+
+[[package]]
+name = "expand-dep-2-dep-2"
+version = "0.2.0"
@@ -6,4 +6,4 @@ edition = "2018"

 [dependencies]
 expand-dep = { path = "../expand_dep" }
-dep = { path = "dep_v2" }
+expand-dep-2-dep-2 = { path = "dep_v2" }
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "expand-dep-2-dep"
 version = "0.1.0"
 authors = ["cbindgen"]
 edition = "2018"
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "expand-dep-2-dep-2"
 version = "0.2.0"
 authors = ["cbindgen"]
 edition = "2018"
@@ -1,6 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "expand"
-version = "0.1.0"
+version = 3

+[[package]]
+name = "expand-features"
+version = "0.1.0"
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-features"
 version = "0.1.0"
 authors = ["cbindgen"]

@@ -1,6 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "expand"
-version = "0.1.0"
+version = 3

+[[package]]
+name = "expand-no-default-features"
+version = "0.1.0"
@@ -1,5 +1,5 @@
 [package]
-name = "expand"
+name = "expand-no-default-features"
 version = "0.1.0"
 authors = ["cbindgen"]

@@ -1,5 +1,5 @@
 [parse]
 parse_deps = false
 [parse.expand]
-crates = ["expand"]
+crates = ["expand-no-default-features"]
 default_features = false
@@ -4,5 +4,5 @@ version = "0.1.0"
 authors = ["cbindgen"]
 workspace = "../workspace"

-[dependencies.dep]
+[dependencies.workspace-dep]
 path = "../workspace/dep"
@@ -1,4 +1,4 @@
-extern crate dep;
+extern crate workspace_dep;

 #[no_mangle]
 pub extern "C" fn consume_ext(_ext: dep::ExtType) {
@@ -1,12 +1,14 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "dep"
-version = "0.1.0"
+version = 3

 [[package]]
 name = "literal_target"
 version = "0.1.0"
 dependencies = [
- "dep",
+ "workspace-dep",
 ]
+
+[[package]]
+name = "workspace-dep"
+version = "0.1.0"
@@ -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" }
@@ -1,20 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "child"
 version = "0.1.0"
 dependencies = [
- "dep 0.1.0",
+ "workspace-dep",
 ]

-[[package]]
-name = "dep"
-version = "0.1.0"
-
 [[package]]
 name = "workspace"
 version = "0.1.0"
 dependencies = [
- "dep 0.1.0",
+ "workspace-dep",
 ]

+[[package]]
+name = "workspace-dep"
+version = "0.1.0"
@@ -3,7 +3,7 @@ name = "workspace"
 version = "0.1.0"
 authors = ["cbindgen"]

-[dependencies.dep]
+[dependencies.workspace-dep]
 path = "dep"

 [workspace]
@@ -1,3 +1,3 @@
 [parse]
 parse_deps = true
-extra_bindings = ["dep"]
+extra_bindings = ["workspace-dep"]
@@ -1,5 +1,5 @@
 [package]
-name = "dep"
+name = "workspace-dep"
 version = "0.1.0"
 authors = ["cbindgen"]