Fix failing tests

mozilla · Apr 17, 2023 · 2241927 · 2241927
1 parent 9ff1a61
commit 2241927
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 35 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
@@ -5,4 +5,4 @@ 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/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_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_features/Cargo.lock b/tests/rust/expand_features/Cargo.lock
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/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]