Fix mock-std as well

rust-lang · Jul 29, 2020 · 7c77fed · 7c77fed
1 parent 769ac7c
commit 7c77fed
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 33 deletions.
diff --git a/tests/testsuite/mock-std/Cargo.toml b/tests/testsuite/mock-std/Cargo.toml
@@ -1,8 +1,8 @@
 [workspace]
 members = [
-  "src/liballoc",
-  "src/libcore",
-  "src/libproc_macro",
-  "src/libstd",
-  "src/libtest",
+  "library/alloc",
+  "library/core",
+  "library/proc_macro",
+  "library/std",
+  "library/test",
 ]
diff --git a/...estsuite/mock-std/src/liballoc/Cargo.toml → ...stsuite/mock-std/library/alloc/Cargo.toml b/...estsuite/mock-std/src/liballoc/Cargo.toml → ...stsuite/mock-std/library/alloc/Cargo.toml
@@ -4,8 +4,5 @@ version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
 registry-dep-using-core = { version = "*", features = ['mockbuild'] }
diff --git a/tests/testsuite/mock-std/src/liballoc/lib.rs → ...stsuite/mock-std/library/alloc/src/lib.rs b/tests/testsuite/mock-std/src/liballoc/lib.rs → ...stsuite/mock-std/library/alloc/src/lib.rs
diff --git a/...k-std/src/libcompiler_builtins/Cargo.toml → ...-std/library/compiler_builtins/Cargo.toml b/...k-std/src/libcompiler_builtins/Cargo.toml → ...-std/library/compiler_builtins/Cargo.toml
@@ -3,6 +3,3 @@ name = "compiler_builtins"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
-
-[lib]
-path = "lib.rs"
diff --git a/.../mock-std/src/libcompiler_builtins/lib.rs → ...-std/library/compiler_builtins/src/lib.rs b/.../mock-std/src/libcompiler_builtins/lib.rs → ...-std/library/compiler_builtins/src/lib.rs
diff --git a/...testsuite/mock-std/src/libcore/Cargo.toml → ...estsuite/mock-std/library/core/Cargo.toml b/...testsuite/mock-std/src/libcore/Cargo.toml → ...estsuite/mock-std/library/core/Cargo.toml
@@ -3,6 +3,3 @@ name = "core"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
-
-[lib]
-path = "lib.rs"
diff --git a/tests/testsuite/mock-std/src/libcore/lib.rs → ...estsuite/mock-std/library/core/src/lib.rs b/tests/testsuite/mock-std/src/libcore/lib.rs → ...estsuite/mock-std/library/core/src/lib.rs
diff --git a/...e/mock-std/src/libpanic_unwind/Cargo.toml → .../mock-std/library/panic_unwind/Cargo.toml b/...e/mock-std/src/libpanic_unwind/Cargo.toml → .../mock-std/library/panic_unwind/Cargo.toml
@@ -3,6 +3,3 @@ name = "panic_unwind"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
-
-[lib]
-path = "lib.rs"
diff --git a/...suite/mock-std/src/libpanic_unwind/lib.rs → .../mock-std/library/panic_unwind/src/lib.rs b/...suite/mock-std/src/libpanic_unwind/lib.rs → .../mock-std/library/panic_unwind/src/lib.rs
diff --git a/...ite/mock-std/src/libproc_macro/Cargo.toml → ...te/mock-std/library/proc_macro/Cargo.toml b/...ite/mock-std/src/libproc_macro/Cargo.toml → ...te/mock-std/library/proc_macro/Cargo.toml
@@ -3,6 +3,3 @@ name = "proc_macro"
 version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
-
-[lib]
-path = "lib.rs"
diff --git a/...stsuite/mock-std/src/libproc_macro/lib.rs → ...te/mock-std/library/proc_macro/src/lib.rs b/...stsuite/mock-std/src/libproc_macro/lib.rs → ...te/mock-std/library/proc_macro/src/lib.rs
diff --git a/...ools/rustc-std-workspace-alloc/Cargo.toml → ...rary/rustc-std-workspace-alloc/Cargo.toml b/...ools/rustc-std-workspace-alloc/Cargo.toml → ...rary/rustc-std-workspace-alloc/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 path = "lib.rs"
 
 [dependencies]
-alloc = { path = "../../liballoc" }
+alloc = { path = "../alloc" }
diff --git a/...rc/tools/rustc-std-workspace-alloc/lib.rs → .../library/rustc-std-workspace-alloc/lib.rs b/...rc/tools/rustc-std-workspace-alloc/lib.rs → .../library/rustc-std-workspace-alloc/lib.rs
diff --git a/...tools/rustc-std-workspace-core/Cargo.toml → ...brary/rustc-std-workspace-core/Cargo.toml b/...tools/rustc-std-workspace-core/Cargo.toml → ...brary/rustc-std-workspace-core/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 path = "lib.rs"
 
 [dependencies]
-core = { path = "../../libcore" }
+core = { path = "../core" }
diff --git a/...src/tools/rustc-std-workspace-core/lib.rs → ...d/library/rustc-std-workspace-core/lib.rs b/...src/tools/rustc-std-workspace-core/lib.rs → ...d/library/rustc-std-workspace-core/lib.rs
diff --git a/.../tools/rustc-std-workspace-std/Cargo.toml → ...ibrary/rustc-std-workspace-std/Cargo.toml b/.../tools/rustc-std-workspace-std/Cargo.toml → ...ibrary/rustc-std-workspace-std/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 path = "lib.rs"
 
 [dependencies]
-std = { path = "../../libstd" }
+std = { path = "../std" }
diff --git a/.../src/tools/rustc-std-workspace-std/lib.rs → ...td/library/rustc-std-workspace-std/lib.rs b/.../src/tools/rustc-std-workspace-std/lib.rs → ...td/library/rustc-std-workspace-std/lib.rs
diff --git a/.../testsuite/mock-std/src/libstd/Cargo.toml → ...testsuite/mock-std/library/std/Cargo.toml b/.../testsuite/mock-std/src/libstd/Cargo.toml → ...testsuite/mock-std/library/std/Cargo.toml
@@ -4,9 +4,6 @@ version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
 registry-dep-using-alloc = { version = "*", features = ['mockbuild'] }
 

diff --git a/tests/testsuite/mock-std/src/libstd/lib.rs → ...testsuite/mock-std/library/std/src/lib.rs b/tests/testsuite/mock-std/src/libstd/lib.rs → ...testsuite/mock-std/library/std/src/lib.rs
diff --git a/...testsuite/mock-std/src/libtest/Cargo.toml → ...estsuite/mock-std/library/test/Cargo.toml b/...testsuite/mock-std/src/libtest/Cargo.toml → ...estsuite/mock-std/library/test/Cargo.toml
@@ -4,14 +4,11 @@ version = "0.1.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 edition = "2018"
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
-proc_macro = { path = "../libproc_macro" }
-std = { path = "../libstd" }
-panic_unwind = { path = "../libpanic_unwind" }
-compiler_builtins = { path = "../libcompiler_builtins" }
+proc_macro = { path = "../proc_macro" }
+std = { path = "../std" }
+panic_unwind = { path = "../panic_unwind" }
+compiler_builtins = { path = "../compiler_builtins" }
 registry-dep-using-std = { version = "*", features = ['mockbuild'] }
 
 [features]

diff --git a/tests/testsuite/mock-std/src/libtest/lib.rs → ...estsuite/mock-std/library/test/src/lib.rs b/tests/testsuite/mock-std/src/libtest/lib.rs → ...estsuite/mock-std/library/test/src/lib.rs