Auto merge of rust-lang#73265 - mark-i-m:mv-std, r=Mark-Simulacrum,ma…

…rk-i-m mv std libs to library/ This is the first step in refactoring the directory layout of this repository, with further followup steps planned (but not done yet). Background: currently, all crates are under src/, without nested src directories and with the unconventional `lib*` prefixes (e.g., `src/libcore/lib.rs`). This directory structures is not idiomatic and makes the `src/` directory rather overwhelming. To improve contributor experience and make things a bit more approachable, we are reorganizing the repo a bit. In this PR, we move the standard libs (basically anything that is "runtime", as opposed to part of the compiler, build system, or one of the tools, etc). The new layout moves these libraries to a new `library/` directory in the root of the repo. Additionally, we remove the `lib*` prefixes and add nested `src/` directories. The other crates/tools in this repo are not touched. So in summary: ``` library/<crate>/src/*.rs src/<all the rest> // unchanged ``` where `<crate>` is: - core - alloc - std - test - proc_macro - panic_abort - panic_unwind - profiler_builtins - term - unwind - rtstartup - backtrace - rustc-std-workspace-* There was a lot of discussion about this and a few rounds of compiler team approvals, FCPs, MCPs, and nominations. The original MCP is rust-lang/compiler-team#298. The final approval of the compiler team was given here: rust-lang#73265 (comment). The name `library` was chosen to complement a later move of the compiler crates to a `compiler/` directory. There was a lot of discussion around adding the nested `src/` directories. Note that this does increase the nesting depth (plausibly important for manual traversal of the tree, e.g., through GitHub's UI or `cd`), but this is deemed to be better as it fits the standard layout of Rust crates throughout most of the ecosystem, though there is some debate about how much this should apply to multi-crate projects. Overall, there seem to be more people in favor of nested `src/` than against. After this PR, there are no dependencies out of the `library/` directory except on the `build_helper` (or crates.io crates).
jyn514 · Jul 28, 2020 · ac48e62 · ac48e62
2 parents 9be8ffc + 2c31b45
commit ac48e62
Show file tree

Hide file tree

Showing 875 changed files with 1,254 additions and 1,222 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -25,8 +25,8 @@
 [submodule "src/doc/rust-by-example"]
 	path = src/doc/rust-by-example
 	url = https://github.com/rust-lang/rust-by-example.git
-[submodule "src/stdarch"]
-	path = src/stdarch
+[submodule "library/stdarch"]
+	path = library/stdarch
 	url = https://github.com/rust-lang/stdarch.git
 [submodule "src/doc/rustc-dev-guide"]
 	path = src/doc/rustc-dev-guide

diff --git a/Cargo.toml b/Cargo.toml
@@ -2,9 +2,9 @@
 members = [
   "src/bootstrap",
   "src/rustc",
-  "src/libstd",
-  "src/libtest",
   "src/librustc_codegen_llvm",
+  "library/std",
+  "library/test",
   "src/tools/cargotest",
   "src/tools/clippy",
   "src/tools/compiletest",
@@ -74,11 +74,11 @@ rustfmt-nightly = { path = "src/tools/rustfmt" }
 # here
 rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }
 
-# See comments in `tools/rustc-std-workspace-core/README.md` for what's going on
+# See comments in `library/rustc-std-workspace-core/README.md` for what's going on
 # here
-rustc-std-workspace-core = { path = 'src/tools/rustc-std-workspace-core' }
-rustc-std-workspace-alloc = { path = 'src/tools/rustc-std-workspace-alloc' }
-rustc-std-workspace-std = { path = 'src/tools/rustc-std-workspace-std' }
+rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
+rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
+rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
diff --git a/src/liballoc/Cargo.toml → library/alloc/Cargo.toml b/src/liballoc/Cargo.toml → library/alloc/Cargo.toml
@@ -6,12 +6,8 @@ autotests = false
 autobenches = false
 edition = "2018"
 
-[lib]
-name = "alloc"
-path = "lib.rs"
-
 [dependencies]
-core = { path = "../libcore" }
+core = { path = "../core" }
 compiler_builtins = { version = "0.1.10", features = ['rustc-dep-of-std'] }
 
 [dev-dependencies]
@@ -20,16 +16,16 @@ rand_xorshift = "0.2"
 
 [[test]]
 name = "collectionstests"
-path = "../liballoc/tests/lib.rs"
+path = "tests/lib.rs"
 
 [[bench]]
 name = "collectionsbenches"
-path = "../liballoc/benches/lib.rs"
+path = "benches/lib.rs"
 test = true
 
 [[bench]]
 name = "vec_deque_append_bench"
-path = "../liballoc/benches/vec_deque_append.rs"
+path = "benches/vec_deque_append.rs"
 harness = false
 
 [features]

diff --git a/src/liballoc/benches/btree/map.rs → library/alloc/benches/btree/map.rs b/src/liballoc/benches/btree/map.rs → library/alloc/benches/btree/map.rs
diff --git a/src/liballoc/benches/btree/mod.rs → library/alloc/benches/btree/mod.rs b/src/liballoc/benches/btree/mod.rs → library/alloc/benches/btree/mod.rs
diff --git a/src/liballoc/benches/btree/set.rs → library/alloc/benches/btree/set.rs b/src/liballoc/benches/btree/set.rs → library/alloc/benches/btree/set.rs
diff --git a/src/liballoc/benches/lib.rs → library/alloc/benches/lib.rs b/src/liballoc/benches/lib.rs → library/alloc/benches/lib.rs
diff --git a/src/liballoc/benches/linked_list.rs → library/alloc/benches/linked_list.rs b/src/liballoc/benches/linked_list.rs → library/alloc/benches/linked_list.rs
diff --git a/src/liballoc/benches/slice.rs → library/alloc/benches/slice.rs b/src/liballoc/benches/slice.rs → library/alloc/benches/slice.rs
diff --git a/src/liballoc/benches/str.rs → library/alloc/benches/str.rs b/src/liballoc/benches/str.rs → library/alloc/benches/str.rs
diff --git a/src/liballoc/benches/string.rs → library/alloc/benches/string.rs b/src/liballoc/benches/string.rs → library/alloc/benches/string.rs
diff --git a/src/liballoc/benches/vec.rs → library/alloc/benches/vec.rs b/src/liballoc/benches/vec.rs → library/alloc/benches/vec.rs
diff --git a/src/liballoc/benches/vec_deque.rs → library/alloc/benches/vec_deque.rs b/src/liballoc/benches/vec_deque.rs → library/alloc/benches/vec_deque.rs
diff --git a/src/liballoc/benches/vec_deque_append.rs → library/alloc/benches/vec_deque_append.rs b/src/liballoc/benches/vec_deque_append.rs → library/alloc/benches/vec_deque_append.rs
diff --git a/src/liballoc/alloc.rs → library/alloc/src/alloc.rs b/src/liballoc/alloc.rs → library/alloc/src/alloc.rs
diff --git a/src/liballoc/alloc/tests.rs → library/alloc/src/alloc/tests.rs b/src/liballoc/alloc/tests.rs → library/alloc/src/alloc/tests.rs
diff --git a/src/liballoc/borrow.rs → library/alloc/src/borrow.rs b/src/liballoc/borrow.rs → library/alloc/src/borrow.rs
diff --git a/src/liballoc/boxed.rs → library/alloc/src/boxed.rs b/src/liballoc/boxed.rs → library/alloc/src/boxed.rs
diff --git a/src/liballoc/collections/binary_heap.rs → library/alloc/src/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs → library/alloc/src/collections/binary_heap.rs
diff --git a/src/liballoc/collections/btree/map.rs → library/alloc/src/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs → library/alloc/src/collections/btree/map.rs
diff --git a/src/liballoc/collections/btree/mod.rs → library/alloc/src/collections/btree/mod.rs b/src/liballoc/collections/btree/mod.rs → library/alloc/src/collections/btree/mod.rs
diff --git a/src/liballoc/collections/btree/navigate.rs → ...y/alloc/src/collections/btree/navigate.rs b/src/liballoc/collections/btree/navigate.rs → ...y/alloc/src/collections/btree/navigate.rs
diff --git a/src/liballoc/collections/btree/node.rs → library/alloc/src/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs → library/alloc/src/collections/btree/node.rs
diff --git a/src/liballoc/collections/btree/search.rs → ...ary/alloc/src/collections/btree/search.rs b/src/liballoc/collections/btree/search.rs → ...ary/alloc/src/collections/btree/search.rs
diff --git a/src/liballoc/collections/btree/set.rs → library/alloc/src/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs → library/alloc/src/collections/btree/set.rs
diff --git a/src/liballoc/collections/linked_list.rs → library/alloc/src/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs → library/alloc/src/collections/linked_list.rs
diff --git a/...liballoc/collections/linked_list/tests.rs → ...lloc/src/collections/linked_list/tests.rs b/...liballoc/collections/linked_list/tests.rs → ...lloc/src/collections/linked_list/tests.rs
diff --git a/src/liballoc/collections/mod.rs → library/alloc/src/collections/mod.rs b/src/liballoc/collections/mod.rs → library/alloc/src/collections/mod.rs
diff --git a/src/liballoc/collections/vec_deque.rs → library/alloc/src/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs → library/alloc/src/collections/vec_deque.rs
diff --git a/src/liballoc/collections/vec_deque/drain.rs → .../alloc/src/collections/vec_deque/drain.rs b/src/liballoc/collections/vec_deque/drain.rs → .../alloc/src/collections/vec_deque/drain.rs
diff --git a/src/liballoc/collections/vec_deque/tests.rs → .../alloc/src/collections/vec_deque/tests.rs b/src/liballoc/collections/vec_deque/tests.rs → .../alloc/src/collections/vec_deque/tests.rs
diff --git a/src/liballoc/fmt.rs → library/alloc/src/fmt.rs b/src/liballoc/fmt.rs → library/alloc/src/fmt.rs
diff --git a/src/liballoc/lib.rs → library/alloc/src/lib.rs b/src/liballoc/lib.rs → library/alloc/src/lib.rs
diff --git a/src/liballoc/macros.rs → library/alloc/src/macros.rs b/src/liballoc/macros.rs → library/alloc/src/macros.rs
diff --git a/src/liballoc/prelude/mod.rs → library/alloc/src/prelude/mod.rs b/src/liballoc/prelude/mod.rs → library/alloc/src/prelude/mod.rs
diff --git a/src/liballoc/prelude/v1.rs → library/alloc/src/prelude/v1.rs b/src/liballoc/prelude/v1.rs → library/alloc/src/prelude/v1.rs
diff --git a/src/liballoc/raw_vec.rs → library/alloc/src/raw_vec.rs b/src/liballoc/raw_vec.rs → library/alloc/src/raw_vec.rs
diff --git a/src/liballoc/raw_vec/tests.rs → library/alloc/src/raw_vec/tests.rs b/src/liballoc/raw_vec/tests.rs → library/alloc/src/raw_vec/tests.rs
diff --git a/src/liballoc/rc.rs → library/alloc/src/rc.rs b/src/liballoc/rc.rs → library/alloc/src/rc.rs
diff --git a/src/liballoc/rc/tests.rs → library/alloc/src/rc/tests.rs b/src/liballoc/rc/tests.rs → library/alloc/src/rc/tests.rs
diff --git a/src/liballoc/slice.rs → library/alloc/src/slice.rs b/src/liballoc/slice.rs → library/alloc/src/slice.rs
diff --git a/src/liballoc/str.rs → library/alloc/src/str.rs b/src/liballoc/str.rs → library/alloc/src/str.rs
diff --git a/src/liballoc/string.rs → library/alloc/src/string.rs b/src/liballoc/string.rs → library/alloc/src/string.rs
diff --git a/src/liballoc/sync.rs → library/alloc/src/sync.rs b/src/liballoc/sync.rs → library/alloc/src/sync.rs
diff --git a/src/liballoc/sync/tests.rs → library/alloc/src/sync/tests.rs b/src/liballoc/sync/tests.rs → library/alloc/src/sync/tests.rs
diff --git a/src/liballoc/task.rs → library/alloc/src/task.rs b/src/liballoc/task.rs → library/alloc/src/task.rs
diff --git a/src/liballoc/tests.rs → library/alloc/src/tests.rs b/src/liballoc/tests.rs → library/alloc/src/tests.rs
diff --git a/src/liballoc/vec.rs → library/alloc/src/vec.rs b/src/liballoc/vec.rs → library/alloc/src/vec.rs
diff --git a/src/liballoc/tests/arc.rs → library/alloc/tests/arc.rs b/src/liballoc/tests/arc.rs → library/alloc/tests/arc.rs
diff --git a/src/liballoc/tests/binary_heap.rs → library/alloc/tests/binary_heap.rs b/src/liballoc/tests/binary_heap.rs → library/alloc/tests/binary_heap.rs
diff --git a/src/liballoc/tests/borrow.rs → library/alloc/tests/borrow.rs b/src/liballoc/tests/borrow.rs → library/alloc/tests/borrow.rs
diff --git a/src/liballoc/tests/boxed.rs → library/alloc/tests/boxed.rs b/src/liballoc/tests/boxed.rs → library/alloc/tests/boxed.rs
diff --git a/src/liballoc/tests/btree/map.rs → library/alloc/tests/btree/map.rs b/src/liballoc/tests/btree/map.rs → library/alloc/tests/btree/map.rs
diff --git a/src/liballoc/tests/btree/mod.rs → library/alloc/tests/btree/mod.rs b/src/liballoc/tests/btree/mod.rs → library/alloc/tests/btree/mod.rs
diff --git a/src/liballoc/tests/btree/set.rs → library/alloc/tests/btree/set.rs b/src/liballoc/tests/btree/set.rs → library/alloc/tests/btree/set.rs
diff --git a/src/liballoc/tests/cow_str.rs → library/alloc/tests/cow_str.rs b/src/liballoc/tests/cow_str.rs → library/alloc/tests/cow_str.rs
diff --git a/src/liballoc/tests/fmt.rs → library/alloc/tests/fmt.rs b/src/liballoc/tests/fmt.rs → library/alloc/tests/fmt.rs
diff --git a/src/liballoc/tests/heap.rs → library/alloc/tests/heap.rs b/src/liballoc/tests/heap.rs → library/alloc/tests/heap.rs
diff --git a/src/liballoc/tests/lib.rs → library/alloc/tests/lib.rs b/src/liballoc/tests/lib.rs → library/alloc/tests/lib.rs
diff --git a/src/liballoc/tests/linked_list.rs → library/alloc/tests/linked_list.rs b/src/liballoc/tests/linked_list.rs → library/alloc/tests/linked_list.rs
diff --git a/src/liballoc/tests/rc.rs → library/alloc/tests/rc.rs b/src/liballoc/tests/rc.rs → library/alloc/tests/rc.rs
diff --git a/src/liballoc/tests/slice.rs → library/alloc/tests/slice.rs b/src/liballoc/tests/slice.rs → library/alloc/tests/slice.rs
diff --git a/src/liballoc/tests/str.rs → library/alloc/tests/str.rs b/src/liballoc/tests/str.rs → library/alloc/tests/str.rs
diff --git a/src/liballoc/tests/string.rs → library/alloc/tests/string.rs b/src/liballoc/tests/string.rs → library/alloc/tests/string.rs
diff --git a/src/liballoc/tests/vec.rs → library/alloc/tests/vec.rs b/src/liballoc/tests/vec.rs → library/alloc/tests/vec.rs
diff --git a/src/liballoc/tests/vec_deque.rs → library/alloc/tests/vec_deque.rs b/src/liballoc/tests/vec_deque.rs → library/alloc/tests/vec_deque.rs
diff --git a/src/libcore/Cargo.toml → library/core/Cargo.toml b/src/libcore/Cargo.toml → library/core/Cargo.toml
@@ -7,18 +7,16 @@ autobenches = false
 edition = "2018"
 
 [lib]
-name = "core"
-path = "lib.rs"
 test = false
 bench = false
 
 [[test]]
 name = "coretests"
-path = "../libcore/tests/lib.rs"
+path = "tests/lib.rs"
 
 [[bench]]
 name = "corebenches"
-path = "../libcore/benches/lib.rs"
+path = "benches/lib.rs"
 test = true
 
 [dev-dependencies]

diff --git a/src/libcore/benches/any.rs → library/core/benches/any.rs b/src/libcore/benches/any.rs → library/core/benches/any.rs
diff --git a/src/libcore/benches/ascii.rs → library/core/benches/ascii.rs b/src/libcore/benches/ascii.rs → library/core/benches/ascii.rs
diff --git a/src/libcore/benches/ascii/is_ascii.rs → library/core/benches/ascii/is_ascii.rs b/src/libcore/benches/ascii/is_ascii.rs → library/core/benches/ascii/is_ascii.rs
diff --git a/src/libcore/benches/char/methods.rs → library/core/benches/char/methods.rs b/src/libcore/benches/char/methods.rs → library/core/benches/char/methods.rs
diff --git a/src/libcore/benches/char/mod.rs → library/core/benches/char/mod.rs b/src/libcore/benches/char/mod.rs → library/core/benches/char/mod.rs
diff --git a/src/libcore/benches/fmt.rs → library/core/benches/fmt.rs b/src/libcore/benches/fmt.rs → library/core/benches/fmt.rs
diff --git a/src/libcore/benches/hash/mod.rs → library/core/benches/hash/mod.rs b/src/libcore/benches/hash/mod.rs → library/core/benches/hash/mod.rs
diff --git a/src/libcore/benches/hash/sip.rs → library/core/benches/hash/sip.rs b/src/libcore/benches/hash/sip.rs → library/core/benches/hash/sip.rs
diff --git a/src/libcore/benches/iter.rs → library/core/benches/iter.rs b/src/libcore/benches/iter.rs → library/core/benches/iter.rs
diff --git a/src/libcore/benches/lib.rs → library/core/benches/lib.rs b/src/libcore/benches/lib.rs → library/core/benches/lib.rs
diff --git a/src/libcore/benches/num/dec2flt/mod.rs → library/core/benches/num/dec2flt/mod.rs b/src/libcore/benches/num/dec2flt/mod.rs → library/core/benches/num/dec2flt/mod.rs
diff --git a/src/libcore/benches/num/flt2dec/mod.rs → library/core/benches/num/flt2dec/mod.rs b/src/libcore/benches/num/flt2dec/mod.rs → library/core/benches/num/flt2dec/mod.rs
diff --git a/...re/benches/num/flt2dec/strategy/dragon.rs → ...re/benches/num/flt2dec/strategy/dragon.rs b/...re/benches/num/flt2dec/strategy/dragon.rs → ...re/benches/num/flt2dec/strategy/dragon.rs
diff --git a/...ore/benches/num/flt2dec/strategy/grisu.rs → ...ore/benches/num/flt2dec/strategy/grisu.rs b/...ore/benches/num/flt2dec/strategy/grisu.rs → ...ore/benches/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcore/benches/num/mod.rs → library/core/benches/num/mod.rs b/src/libcore/benches/num/mod.rs → library/core/benches/num/mod.rs
diff --git a/src/libcore/benches/ops.rs → library/core/benches/ops.rs b/src/libcore/benches/ops.rs → library/core/benches/ops.rs
diff --git a/src/libcore/benches/pattern.rs → library/core/benches/pattern.rs b/src/libcore/benches/pattern.rs → library/core/benches/pattern.rs
diff --git a/src/libcore/benches/slice.rs → library/core/benches/slice.rs b/src/libcore/benches/slice.rs → library/core/benches/slice.rs
diff --git a/src/libcore/alloc/global.rs → library/core/src/alloc/global.rs b/src/libcore/alloc/global.rs → library/core/src/alloc/global.rs
diff --git a/src/libcore/alloc/layout.rs → library/core/src/alloc/layout.rs b/src/libcore/alloc/layout.rs → library/core/src/alloc/layout.rs
diff --git a/src/libcore/alloc/mod.rs → library/core/src/alloc/mod.rs b/src/libcore/alloc/mod.rs → library/core/src/alloc/mod.rs
diff --git a/src/libcore/any.rs → library/core/src/any.rs b/src/libcore/any.rs → library/core/src/any.rs
diff --git a/src/libcore/array/iter.rs → library/core/src/array/iter.rs b/src/libcore/array/iter.rs → library/core/src/array/iter.rs
diff --git a/src/libcore/array/mod.rs → library/core/src/array/mod.rs b/src/libcore/array/mod.rs → library/core/src/array/mod.rs
diff --git a/src/libcore/ascii.rs → library/core/src/ascii.rs b/src/libcore/ascii.rs → library/core/src/ascii.rs
diff --git a/src/libcore/bool.rs → library/core/src/bool.rs b/src/libcore/bool.rs → library/core/src/bool.rs
diff --git a/src/libcore/borrow.rs → library/core/src/borrow.rs b/src/libcore/borrow.rs → library/core/src/borrow.rs
diff --git a/src/libcore/cell.rs → library/core/src/cell.rs b/src/libcore/cell.rs → library/core/src/cell.rs
diff --git a/src/libcore/char/convert.rs → library/core/src/char/convert.rs b/src/libcore/char/convert.rs → library/core/src/char/convert.rs
diff --git a/src/libcore/char/decode.rs → library/core/src/char/decode.rs b/src/libcore/char/decode.rs → library/core/src/char/decode.rs
diff --git a/src/libcore/char/methods.rs → library/core/src/char/methods.rs b/src/libcore/char/methods.rs → library/core/src/char/methods.rs
diff --git a/src/libcore/char/mod.rs → library/core/src/char/mod.rs b/src/libcore/char/mod.rs → library/core/src/char/mod.rs
diff --git a/src/libcore/clone.rs → library/core/src/clone.rs b/src/libcore/clone.rs → library/core/src/clone.rs
diff --git a/src/libcore/cmp.rs → library/core/src/cmp.rs b/src/libcore/cmp.rs → library/core/src/cmp.rs
diff --git a/src/libcore/convert/mod.rs → library/core/src/convert/mod.rs b/src/libcore/convert/mod.rs → library/core/src/convert/mod.rs
diff --git a/src/libcore/convert/num.rs → library/core/src/convert/num.rs b/src/libcore/convert/num.rs → library/core/src/convert/num.rs
diff --git a/src/libcore/default.rs → library/core/src/default.rs b/src/libcore/default.rs → library/core/src/default.rs
diff --git a/src/libcore/ffi.rs → library/core/src/ffi.rs b/src/libcore/ffi.rs → library/core/src/ffi.rs
diff --git a/src/libcore/fmt/builders.rs → library/core/src/fmt/builders.rs b/src/libcore/fmt/builders.rs → library/core/src/fmt/builders.rs
diff --git a/src/libcore/fmt/float.rs → library/core/src/fmt/float.rs b/src/libcore/fmt/float.rs → library/core/src/fmt/float.rs
diff --git a/src/libcore/fmt/mod.rs → library/core/src/fmt/mod.rs b/src/libcore/fmt/mod.rs → library/core/src/fmt/mod.rs
diff --git a/src/libcore/fmt/num.rs → library/core/src/fmt/num.rs b/src/libcore/fmt/num.rs → library/core/src/fmt/num.rs
diff --git a/src/libcore/fmt/rt/v1.rs → library/core/src/fmt/rt/v1.rs b/src/libcore/fmt/rt/v1.rs → library/core/src/fmt/rt/v1.rs
diff --git a/src/libcore/future/future.rs → library/core/src/future/future.rs b/src/libcore/future/future.rs → library/core/src/future/future.rs
diff --git a/src/libcore/future/into_future.rs → library/core/src/future/into_future.rs b/src/libcore/future/into_future.rs → library/core/src/future/into_future.rs
diff --git a/src/libcore/future/mod.rs → library/core/src/future/mod.rs b/src/libcore/future/mod.rs → library/core/src/future/mod.rs
diff --git a/src/libcore/future/pending.rs → library/core/src/future/pending.rs b/src/libcore/future/pending.rs → library/core/src/future/pending.rs
diff --git a/src/libcore/future/poll_fn.rs → library/core/src/future/poll_fn.rs b/src/libcore/future/poll_fn.rs → library/core/src/future/poll_fn.rs
diff --git a/src/libcore/future/ready.rs → library/core/src/future/ready.rs b/src/libcore/future/ready.rs → library/core/src/future/ready.rs
diff --git a/src/libcore/hash/mod.rs → library/core/src/hash/mod.rs b/src/libcore/hash/mod.rs → library/core/src/hash/mod.rs
diff --git a/src/libcore/hash/sip.rs → library/core/src/hash/sip.rs b/src/libcore/hash/sip.rs → library/core/src/hash/sip.rs
diff --git a/src/libcore/hint.rs → library/core/src/hint.rs b/src/libcore/hint.rs → library/core/src/hint.rs
diff --git a/src/libcore/internal_macros.rs → library/core/src/internal_macros.rs b/src/libcore/internal_macros.rs → library/core/src/internal_macros.rs
diff --git a/src/libcore/intrinsics.rs → library/core/src/intrinsics.rs b/src/libcore/intrinsics.rs → library/core/src/intrinsics.rs
diff --git a/src/libcore/iter/adapters/chain.rs → library/core/src/iter/adapters/chain.rs b/src/libcore/iter/adapters/chain.rs → library/core/src/iter/adapters/chain.rs
diff --git a/src/libcore/iter/adapters/flatten.rs → library/core/src/iter/adapters/flatten.rs b/src/libcore/iter/adapters/flatten.rs → library/core/src/iter/adapters/flatten.rs
diff --git a/src/libcore/iter/adapters/fuse.rs → library/core/src/iter/adapters/fuse.rs b/src/libcore/iter/adapters/fuse.rs → library/core/src/iter/adapters/fuse.rs
diff --git a/src/libcore/iter/adapters/mod.rs → library/core/src/iter/adapters/mod.rs b/src/libcore/iter/adapters/mod.rs → library/core/src/iter/adapters/mod.rs
diff --git a/src/libcore/iter/adapters/zip.rs → library/core/src/iter/adapters/zip.rs b/src/libcore/iter/adapters/zip.rs → library/core/src/iter/adapters/zip.rs
diff --git a/src/libcore/iter/mod.rs → library/core/src/iter/mod.rs b/src/libcore/iter/mod.rs → library/core/src/iter/mod.rs
diff --git a/src/libcore/iter/range.rs → library/core/src/iter/range.rs b/src/libcore/iter/range.rs → library/core/src/iter/range.rs
diff --git a/src/libcore/iter/sources.rs → library/core/src/iter/sources.rs b/src/libcore/iter/sources.rs → library/core/src/iter/sources.rs
diff --git a/src/libcore/iter/traits/accum.rs → library/core/src/iter/traits/accum.rs b/src/libcore/iter/traits/accum.rs → library/core/src/iter/traits/accum.rs
diff --git a/src/libcore/iter/traits/collect.rs → library/core/src/iter/traits/collect.rs b/src/libcore/iter/traits/collect.rs → library/core/src/iter/traits/collect.rs
diff --git a/src/libcore/iter/traits/double_ended.rs → library/core/src/iter/traits/double_ended.rs b/src/libcore/iter/traits/double_ended.rs → library/core/src/iter/traits/double_ended.rs
diff --git a/src/libcore/iter/traits/exact_size.rs → library/core/src/iter/traits/exact_size.rs b/src/libcore/iter/traits/exact_size.rs → library/core/src/iter/traits/exact_size.rs
diff --git a/src/libcore/iter/traits/iterator.rs → library/core/src/iter/traits/iterator.rs b/src/libcore/iter/traits/iterator.rs → library/core/src/iter/traits/iterator.rs
diff --git a/src/libcore/iter/traits/marker.rs → library/core/src/iter/traits/marker.rs b/src/libcore/iter/traits/marker.rs → library/core/src/iter/traits/marker.rs
diff --git a/src/libcore/iter/traits/mod.rs → library/core/src/iter/traits/mod.rs b/src/libcore/iter/traits/mod.rs → library/core/src/iter/traits/mod.rs
diff --git a/src/libcore/lazy.rs → library/core/src/lazy.rs b/src/libcore/lazy.rs → library/core/src/lazy.rs
diff --git a/src/libcore/lib.rs → library/core/src/lib.rs b/src/libcore/lib.rs → library/core/src/lib.rs
@@ -283,7 +283,7 @@ pub mod primitive;
 // `core_arch` depends on libcore, but the contents of this module are
 // set up in such a way that directly pulling it here works such that the
 // crate uses the this crate as its libcore.
-#[path = "../stdarch/crates/core_arch/src/mod.rs"]
+#[path = "../../stdarch/crates/core_arch/src/mod.rs"]
 #[allow(
     missing_docs,
     missing_debug_implementations,

diff --git a/src/libcore/macros/mod.rs → library/core/src/macros/mod.rs b/src/libcore/macros/mod.rs → library/core/src/macros/mod.rs
diff --git a/src/libcore/macros/panic.md → library/core/src/macros/panic.md b/src/libcore/macros/panic.md → library/core/src/macros/panic.md
diff --git a/src/libcore/marker.rs → library/core/src/marker.rs b/src/libcore/marker.rs → library/core/src/marker.rs
diff --git a/src/libcore/mem/manually_drop.rs → library/core/src/mem/manually_drop.rs b/src/libcore/mem/manually_drop.rs → library/core/src/mem/manually_drop.rs
diff --git a/src/libcore/mem/maybe_uninit.rs → library/core/src/mem/maybe_uninit.rs b/src/libcore/mem/maybe_uninit.rs → library/core/src/mem/maybe_uninit.rs
diff --git a/src/libcore/mem/mod.rs → library/core/src/mem/mod.rs b/src/libcore/mem/mod.rs → library/core/src/mem/mod.rs
diff --git a/src/libcore/num/bignum.rs → library/core/src/num/bignum.rs b/src/libcore/num/bignum.rs → library/core/src/num/bignum.rs
diff --git a/src/libcore/num/dec2flt/algorithm.rs → library/core/src/num/dec2flt/algorithm.rs b/src/libcore/num/dec2flt/algorithm.rs → library/core/src/num/dec2flt/algorithm.rs
diff --git a/src/libcore/num/dec2flt/mod.rs → library/core/src/num/dec2flt/mod.rs b/src/libcore/num/dec2flt/mod.rs → library/core/src/num/dec2flt/mod.rs
diff --git a/src/libcore/num/dec2flt/num.rs → library/core/src/num/dec2flt/num.rs b/src/libcore/num/dec2flt/num.rs → library/core/src/num/dec2flt/num.rs
diff --git a/src/libcore/num/dec2flt/parse.rs → library/core/src/num/dec2flt/parse.rs b/src/libcore/num/dec2flt/parse.rs → library/core/src/num/dec2flt/parse.rs
diff --git a/src/libcore/num/dec2flt/rawfp.rs → library/core/src/num/dec2flt/rawfp.rs b/src/libcore/num/dec2flt/rawfp.rs → library/core/src/num/dec2flt/rawfp.rs
diff --git a/src/libcore/num/dec2flt/table.rs → library/core/src/num/dec2flt/table.rs b/src/libcore/num/dec2flt/table.rs → library/core/src/num/dec2flt/table.rs
diff --git a/src/libcore/num/diy_float.rs → library/core/src/num/diy_float.rs b/src/libcore/num/diy_float.rs → library/core/src/num/diy_float.rs
diff --git a/src/libcore/num/f32.rs → library/core/src/num/f32.rs b/src/libcore/num/f32.rs → library/core/src/num/f32.rs
diff --git a/src/libcore/num/f64.rs → library/core/src/num/f64.rs b/src/libcore/num/f64.rs → library/core/src/num/f64.rs
diff --git a/src/libcore/num/flt2dec/decoder.rs → library/core/src/num/flt2dec/decoder.rs b/src/libcore/num/flt2dec/decoder.rs → library/core/src/num/flt2dec/decoder.rs
diff --git a/src/libcore/num/flt2dec/estimator.rs → library/core/src/num/flt2dec/estimator.rs b/src/libcore/num/flt2dec/estimator.rs → library/core/src/num/flt2dec/estimator.rs
diff --git a/src/libcore/num/flt2dec/mod.rs → library/core/src/num/flt2dec/mod.rs b/src/libcore/num/flt2dec/mod.rs → library/core/src/num/flt2dec/mod.rs
diff --git a/src/libcore/num/flt2dec/strategy/dragon.rs → ...y/core/src/num/flt2dec/strategy/dragon.rs b/src/libcore/num/flt2dec/strategy/dragon.rs → ...y/core/src/num/flt2dec/strategy/dragon.rs
diff --git a/src/libcore/num/flt2dec/strategy/grisu.rs → ...ry/core/src/num/flt2dec/strategy/grisu.rs b/src/libcore/num/flt2dec/strategy/grisu.rs → ...ry/core/src/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcore/num/i128.rs → library/core/src/num/i128.rs b/src/libcore/num/i128.rs → library/core/src/num/i128.rs
diff --git a/src/libcore/num/i16.rs → library/core/src/num/i16.rs b/src/libcore/num/i16.rs → library/core/src/num/i16.rs
diff --git a/src/libcore/num/i32.rs → library/core/src/num/i32.rs b/src/libcore/num/i32.rs → library/core/src/num/i32.rs
diff --git a/src/libcore/num/i64.rs → library/core/src/num/i64.rs b/src/libcore/num/i64.rs → library/core/src/num/i64.rs
diff --git a/src/libcore/num/i8.rs → library/core/src/num/i8.rs b/src/libcore/num/i8.rs → library/core/src/num/i8.rs
diff --git a/src/libcore/num/int_macros.rs → library/core/src/num/int_macros.rs b/src/libcore/num/int_macros.rs → library/core/src/num/int_macros.rs
diff --git a/src/libcore/num/isize.rs → library/core/src/num/isize.rs b/src/libcore/num/isize.rs → library/core/src/num/isize.rs
diff --git a/src/libcore/num/mod.rs → library/core/src/num/mod.rs b/src/libcore/num/mod.rs → library/core/src/num/mod.rs
diff --git a/src/libcore/num/u128.rs → library/core/src/num/u128.rs b/src/libcore/num/u128.rs → library/core/src/num/u128.rs
diff --git a/src/libcore/num/u16.rs → library/core/src/num/u16.rs b/src/libcore/num/u16.rs → library/core/src/num/u16.rs
diff --git a/src/libcore/num/u32.rs → library/core/src/num/u32.rs b/src/libcore/num/u32.rs → library/core/src/num/u32.rs
diff --git a/src/libcore/num/u64.rs → library/core/src/num/u64.rs b/src/libcore/num/u64.rs → library/core/src/num/u64.rs
diff --git a/src/libcore/num/u8.rs → library/core/src/num/u8.rs b/src/libcore/num/u8.rs → library/core/src/num/u8.rs
diff --git a/src/libcore/num/usize.rs → library/core/src/num/usize.rs b/src/libcore/num/usize.rs → library/core/src/num/usize.rs
diff --git a/src/libcore/num/wrapping.rs → library/core/src/num/wrapping.rs b/src/libcore/num/wrapping.rs → library/core/src/num/wrapping.rs
diff --git a/src/libcore/ops/arith.rs → library/core/src/ops/arith.rs b/src/libcore/ops/arith.rs → library/core/src/ops/arith.rs
diff --git a/src/libcore/ops/bit.rs → library/core/src/ops/bit.rs b/src/libcore/ops/bit.rs → library/core/src/ops/bit.rs
diff --git a/src/libcore/ops/deref.rs → library/core/src/ops/deref.rs b/src/libcore/ops/deref.rs → library/core/src/ops/deref.rs
diff --git a/src/libcore/ops/drop.rs → library/core/src/ops/drop.rs b/src/libcore/ops/drop.rs → library/core/src/ops/drop.rs
diff --git a/src/libcore/ops/function.rs → library/core/src/ops/function.rs b/src/libcore/ops/function.rs → library/core/src/ops/function.rs
diff --git a/src/libcore/ops/generator.rs → library/core/src/ops/generator.rs b/src/libcore/ops/generator.rs → library/core/src/ops/generator.rs
diff --git a/src/libcore/ops/index.rs → library/core/src/ops/index.rs b/src/libcore/ops/index.rs → library/core/src/ops/index.rs
diff --git a/src/libcore/ops/mod.rs → library/core/src/ops/mod.rs b/src/libcore/ops/mod.rs → library/core/src/ops/mod.rs
diff --git a/src/libcore/ops/range.rs → library/core/src/ops/range.rs b/src/libcore/ops/range.rs → library/core/src/ops/range.rs
diff --git a/src/libcore/ops/try.rs → library/core/src/ops/try.rs b/src/libcore/ops/try.rs → library/core/src/ops/try.rs
diff --git a/src/libcore/ops/unsize.rs → library/core/src/ops/unsize.rs b/src/libcore/ops/unsize.rs → library/core/src/ops/unsize.rs
diff --git a/src/libcore/option.rs → library/core/src/option.rs b/src/libcore/option.rs → library/core/src/option.rs
diff --git a/src/libcore/panic.rs → library/core/src/panic.rs b/src/libcore/panic.rs → library/core/src/panic.rs
diff --git a/src/libcore/panicking.rs → library/core/src/panicking.rs b/src/libcore/panicking.rs → library/core/src/panicking.rs
diff --git a/src/libcore/pin.rs → library/core/src/pin.rs b/src/libcore/pin.rs → library/core/src/pin.rs
diff --git a/src/libcore/prelude/mod.rs → library/core/src/prelude/mod.rs b/src/libcore/prelude/mod.rs → library/core/src/prelude/mod.rs
diff --git a/src/libcore/prelude/v1.rs → library/core/src/prelude/v1.rs b/src/libcore/prelude/v1.rs → library/core/src/prelude/v1.rs
diff --git a/src/libcore/primitive.rs → library/core/src/primitive.rs b/src/libcore/primitive.rs → library/core/src/primitive.rs
diff --git a/src/libcore/ptr/const_ptr.rs → library/core/src/ptr/const_ptr.rs b/src/libcore/ptr/const_ptr.rs → library/core/src/ptr/const_ptr.rs
diff --git a/src/libcore/ptr/mod.rs → library/core/src/ptr/mod.rs b/src/libcore/ptr/mod.rs → library/core/src/ptr/mod.rs
diff --git a/src/libcore/ptr/mut_ptr.rs → library/core/src/ptr/mut_ptr.rs b/src/libcore/ptr/mut_ptr.rs → library/core/src/ptr/mut_ptr.rs
diff --git a/src/libcore/ptr/non_null.rs → library/core/src/ptr/non_null.rs b/src/libcore/ptr/non_null.rs → library/core/src/ptr/non_null.rs
diff --git a/src/libcore/ptr/unique.rs → library/core/src/ptr/unique.rs b/src/libcore/ptr/unique.rs → library/core/src/ptr/unique.rs
diff --git a/src/libcore/raw.rs → library/core/src/raw.rs b/src/libcore/raw.rs → library/core/src/raw.rs
diff --git a/src/libcore/result.rs → library/core/src/result.rs b/src/libcore/result.rs → library/core/src/result.rs
diff --git a/src/libcore/slice/memchr.rs → library/core/src/slice/memchr.rs b/src/libcore/slice/memchr.rs → library/core/src/slice/memchr.rs
diff --git a/src/libcore/slice/mod.rs → library/core/src/slice/mod.rs b/src/libcore/slice/mod.rs → library/core/src/slice/mod.rs
diff --git a/src/libcore/slice/rotate.rs → library/core/src/slice/rotate.rs b/src/libcore/slice/rotate.rs → library/core/src/slice/rotate.rs
diff --git a/src/libcore/slice/sort.rs → library/core/src/slice/sort.rs b/src/libcore/slice/sort.rs → library/core/src/slice/sort.rs
diff --git a/src/libcore/str/lossy.rs → library/core/src/str/lossy.rs b/src/libcore/str/lossy.rs → library/core/src/str/lossy.rs
diff --git a/src/libcore/str/mod.rs → library/core/src/str/mod.rs b/src/libcore/str/mod.rs → library/core/src/str/mod.rs
diff --git a/src/libcore/str/pattern.rs → library/core/src/str/pattern.rs b/src/libcore/str/pattern.rs → library/core/src/str/pattern.rs
diff --git a/src/libcore/sync/atomic.rs → library/core/src/sync/atomic.rs b/src/libcore/sync/atomic.rs → library/core/src/sync/atomic.rs
diff --git a/src/libcore/sync/mod.rs → library/core/src/sync/mod.rs b/src/libcore/sync/mod.rs → library/core/src/sync/mod.rs
diff --git a/src/libcore/task/mod.rs → library/core/src/task/mod.rs b/src/libcore/task/mod.rs → library/core/src/task/mod.rs
diff --git a/src/libcore/task/poll.rs → library/core/src/task/poll.rs b/src/libcore/task/poll.rs → library/core/src/task/poll.rs
diff --git a/src/libcore/task/ready.rs → library/core/src/task/ready.rs b/src/libcore/task/ready.rs → library/core/src/task/ready.rs
diff --git a/src/libcore/task/wake.rs → library/core/src/task/wake.rs b/src/libcore/task/wake.rs → library/core/src/task/wake.rs
diff --git a/src/libcore/time.rs → library/core/src/time.rs b/src/libcore/time.rs → library/core/src/time.rs
diff --git a/src/libcore/tuple.rs → library/core/src/tuple.rs b/src/libcore/tuple.rs → library/core/src/tuple.rs
diff --git a/src/libcore/unicode/mod.rs → library/core/src/unicode/mod.rs b/src/libcore/unicode/mod.rs → library/core/src/unicode/mod.rs
diff --git a/src/libcore/unicode/printable.py → library/core/src/unicode/printable.py b/src/libcore/unicode/printable.py → library/core/src/unicode/printable.py
diff --git a/src/libcore/unicode/printable.rs → library/core/src/unicode/printable.rs b/src/libcore/unicode/printable.rs → library/core/src/unicode/printable.rs
diff --git a/src/libcore/unicode/unicode_data.rs → library/core/src/unicode/unicode_data.rs b/src/libcore/unicode/unicode_data.rs → library/core/src/unicode/unicode_data.rs
diff --git a/src/libcore/unit.rs → library/core/src/unit.rs b/src/libcore/unit.rs → library/core/src/unit.rs
diff --git a/src/libcore/tests/alloc.rs → library/core/tests/alloc.rs b/src/libcore/tests/alloc.rs → library/core/tests/alloc.rs
diff --git a/src/libcore/tests/any.rs → library/core/tests/any.rs b/src/libcore/tests/any.rs → library/core/tests/any.rs
diff --git a/src/libcore/tests/array.rs → library/core/tests/array.rs b/src/libcore/tests/array.rs → library/core/tests/array.rs
diff --git a/src/libcore/tests/ascii.rs → library/core/tests/ascii.rs b/src/libcore/tests/ascii.rs → library/core/tests/ascii.rs
diff --git a/src/libcore/tests/atomic.rs → library/core/tests/atomic.rs b/src/libcore/tests/atomic.rs → library/core/tests/atomic.rs
diff --git a/src/libcore/tests/bool.rs → library/core/tests/bool.rs b/src/libcore/tests/bool.rs → library/core/tests/bool.rs
diff --git a/src/libcore/tests/cell.rs → library/core/tests/cell.rs b/src/libcore/tests/cell.rs → library/core/tests/cell.rs
diff --git a/src/libcore/tests/char.rs → library/core/tests/char.rs b/src/libcore/tests/char.rs → library/core/tests/char.rs
diff --git a/src/libcore/tests/clone.rs → library/core/tests/clone.rs b/src/libcore/tests/clone.rs → library/core/tests/clone.rs
diff --git a/src/libcore/tests/cmp.rs → library/core/tests/cmp.rs b/src/libcore/tests/cmp.rs → library/core/tests/cmp.rs
diff --git a/src/libcore/tests/fmt/builders.rs → library/core/tests/fmt/builders.rs b/src/libcore/tests/fmt/builders.rs → library/core/tests/fmt/builders.rs
diff --git a/src/libcore/tests/fmt/float.rs → library/core/tests/fmt/float.rs b/src/libcore/tests/fmt/float.rs → library/core/tests/fmt/float.rs
diff --git a/src/libcore/tests/fmt/mod.rs → library/core/tests/fmt/mod.rs b/src/libcore/tests/fmt/mod.rs → library/core/tests/fmt/mod.rs
diff --git a/src/libcore/tests/fmt/num.rs → library/core/tests/fmt/num.rs b/src/libcore/tests/fmt/num.rs → library/core/tests/fmt/num.rs
diff --git a/src/libcore/tests/hash/mod.rs → library/core/tests/hash/mod.rs b/src/libcore/tests/hash/mod.rs → library/core/tests/hash/mod.rs
diff --git a/src/libcore/tests/hash/sip.rs → library/core/tests/hash/sip.rs b/src/libcore/tests/hash/sip.rs → library/core/tests/hash/sip.rs
diff --git a/src/libcore/tests/intrinsics.rs → library/core/tests/intrinsics.rs b/src/libcore/tests/intrinsics.rs → library/core/tests/intrinsics.rs
diff --git a/src/libcore/tests/iter.rs → library/core/tests/iter.rs b/src/libcore/tests/iter.rs → library/core/tests/iter.rs
diff --git a/src/libcore/tests/lazy.rs → library/core/tests/lazy.rs b/src/libcore/tests/lazy.rs → library/core/tests/lazy.rs
diff --git a/src/libcore/tests/lib.rs → library/core/tests/lib.rs b/src/libcore/tests/lib.rs → library/core/tests/lib.rs
diff --git a/src/libcore/tests/manually_drop.rs → library/core/tests/manually_drop.rs b/src/libcore/tests/manually_drop.rs → library/core/tests/manually_drop.rs
diff --git a/src/libcore/tests/mem.rs → library/core/tests/mem.rs b/src/libcore/tests/mem.rs → library/core/tests/mem.rs
diff --git a/src/libcore/tests/nonzero.rs → library/core/tests/nonzero.rs b/src/libcore/tests/nonzero.rs → library/core/tests/nonzero.rs
diff --git a/src/libcore/tests/num/bignum.rs → library/core/tests/num/bignum.rs b/src/libcore/tests/num/bignum.rs → library/core/tests/num/bignum.rs
diff --git a/src/libcore/tests/num/dec2flt/mod.rs → library/core/tests/num/dec2flt/mod.rs b/src/libcore/tests/num/dec2flt/mod.rs → library/core/tests/num/dec2flt/mod.rs
diff --git a/src/libcore/tests/num/dec2flt/parse.rs → library/core/tests/num/dec2flt/parse.rs b/src/libcore/tests/num/dec2flt/parse.rs → library/core/tests/num/dec2flt/parse.rs
diff --git a/src/libcore/tests/num/dec2flt/rawfp.rs → library/core/tests/num/dec2flt/rawfp.rs b/src/libcore/tests/num/dec2flt/rawfp.rs → library/core/tests/num/dec2flt/rawfp.rs
diff --git a/src/libcore/tests/num/flt2dec/estimator.rs → library/core/tests/num/flt2dec/estimator.rs b/src/libcore/tests/num/flt2dec/estimator.rs → library/core/tests/num/flt2dec/estimator.rs
diff --git a/src/libcore/tests/num/flt2dec/mod.rs → library/core/tests/num/flt2dec/mod.rs b/src/libcore/tests/num/flt2dec/mod.rs → library/core/tests/num/flt2dec/mod.rs
diff --git a/src/libcore/tests/num/flt2dec/random.rs → library/core/tests/num/flt2dec/random.rs b/src/libcore/tests/num/flt2dec/random.rs → library/core/tests/num/flt2dec/random.rs
diff --git a/...core/tests/num/flt2dec/strategy/dragon.rs → ...core/tests/num/flt2dec/strategy/dragon.rs b/...core/tests/num/flt2dec/strategy/dragon.rs → ...core/tests/num/flt2dec/strategy/dragon.rs
diff --git a/...bcore/tests/num/flt2dec/strategy/grisu.rs → .../core/tests/num/flt2dec/strategy/grisu.rs b/...bcore/tests/num/flt2dec/strategy/grisu.rs → .../core/tests/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcore/tests/num/i16.rs → library/core/tests/num/i16.rs b/src/libcore/tests/num/i16.rs → library/core/tests/num/i16.rs
diff --git a/src/libcore/tests/num/i32.rs → library/core/tests/num/i32.rs b/src/libcore/tests/num/i32.rs → library/core/tests/num/i32.rs
diff --git a/src/libcore/tests/num/i64.rs → library/core/tests/num/i64.rs b/src/libcore/tests/num/i64.rs → library/core/tests/num/i64.rs
diff --git a/src/libcore/tests/num/i8.rs → library/core/tests/num/i8.rs b/src/libcore/tests/num/i8.rs → library/core/tests/num/i8.rs
diff --git a/src/libcore/tests/num/int_macros.rs → library/core/tests/num/int_macros.rs b/src/libcore/tests/num/int_macros.rs → library/core/tests/num/int_macros.rs
diff --git a/src/libcore/tests/num/mod.rs → library/core/tests/num/mod.rs b/src/libcore/tests/num/mod.rs → library/core/tests/num/mod.rs
diff --git a/src/libcore/tests/num/u16.rs → library/core/tests/num/u16.rs b/src/libcore/tests/num/u16.rs → library/core/tests/num/u16.rs
diff --git a/src/libcore/tests/num/u32.rs → library/core/tests/num/u32.rs b/src/libcore/tests/num/u32.rs → library/core/tests/num/u32.rs
diff --git a/src/libcore/tests/num/u64.rs → library/core/tests/num/u64.rs b/src/libcore/tests/num/u64.rs → library/core/tests/num/u64.rs
diff --git a/src/libcore/tests/num/u8.rs → library/core/tests/num/u8.rs b/src/libcore/tests/num/u8.rs → library/core/tests/num/u8.rs
diff --git a/src/libcore/tests/num/uint_macros.rs → library/core/tests/num/uint_macros.rs b/src/libcore/tests/num/uint_macros.rs → library/core/tests/num/uint_macros.rs
diff --git a/src/libcore/tests/ops.rs → library/core/tests/ops.rs b/src/libcore/tests/ops.rs → library/core/tests/ops.rs
diff --git a/src/libcore/tests/option.rs → library/core/tests/option.rs b/src/libcore/tests/option.rs → library/core/tests/option.rs
diff --git a/src/libcore/tests/pattern.rs → library/core/tests/pattern.rs b/src/libcore/tests/pattern.rs → library/core/tests/pattern.rs
diff --git a/src/libcore/tests/ptr.rs → library/core/tests/ptr.rs b/src/libcore/tests/ptr.rs → library/core/tests/ptr.rs
diff --git a/src/libcore/tests/result.rs → library/core/tests/result.rs b/src/libcore/tests/result.rs → library/core/tests/result.rs
diff --git a/src/libcore/tests/slice.rs → library/core/tests/slice.rs b/src/libcore/tests/slice.rs → library/core/tests/slice.rs
diff --git a/src/libcore/tests/str.rs → library/core/tests/str.rs b/src/libcore/tests/str.rs → library/core/tests/str.rs
diff --git a/src/libcore/tests/str_lossy.rs → library/core/tests/str_lossy.rs b/src/libcore/tests/str_lossy.rs → library/core/tests/str_lossy.rs
diff --git a/src/libcore/tests/time.rs → library/core/tests/time.rs b/src/libcore/tests/time.rs → library/core/tests/time.rs
diff --git a/src/libcore/tests/tuple.rs → library/core/tests/tuple.rs b/src/libcore/tests/tuple.rs → library/core/tests/tuple.rs
diff --git a/src/libpanic_abort/Cargo.toml → library/panic_abort/Cargo.toml b/src/libpanic_abort/Cargo.toml → library/panic_abort/Cargo.toml
@@ -5,13 +5,12 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-path = "lib.rs"
 test = false
 bench = false
 doc = false
 
 [dependencies]
 cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
-core = { path = "../libcore" }
+core = { path = "../core" }
 libc = { version = "0.2", default-features = false }
 compiler_builtins = "0.1.0"
diff --git a/src/libpanic_abort/lib.rs → library/panic_abort/src/lib.rs b/src/libpanic_abort/lib.rs → library/panic_abort/src/lib.rs
diff --git a/src/libpanic_unwind/Cargo.toml → library/panic_unwind/Cargo.toml b/src/libpanic_unwind/Cargo.toml → library/panic_unwind/Cargo.toml
@@ -5,15 +5,14 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-path = "lib.rs"
 test = false
 bench = false
 doc = false
 
 [dependencies]
-alloc = { path = "../liballoc" }
-core = { path = "../libcore" }
+alloc = { path = "../alloc" }
+core = { path = "../core" }
 libc = { version = "0.2", default-features = false }
-unwind = { path = "../libunwind" }
+unwind = { path = "../unwind" }
 compiler_builtins = "0.1.0"
 cfg-if = "0.1.8"
diff --git a/src/libpanic_unwind/dummy.rs → library/panic_unwind/src/dummy.rs b/src/libpanic_unwind/dummy.rs → library/panic_unwind/src/dummy.rs
diff --git a/src/libpanic_unwind/dwarf/eh.rs → library/panic_unwind/src/dwarf/eh.rs b/src/libpanic_unwind/dwarf/eh.rs → library/panic_unwind/src/dwarf/eh.rs
diff --git a/src/libpanic_unwind/dwarf/mod.rs → library/panic_unwind/src/dwarf/mod.rs b/src/libpanic_unwind/dwarf/mod.rs → library/panic_unwind/src/dwarf/mod.rs
diff --git a/src/libpanic_unwind/dwarf/tests.rs → library/panic_unwind/src/dwarf/tests.rs b/src/libpanic_unwind/dwarf/tests.rs → library/panic_unwind/src/dwarf/tests.rs
diff --git a/src/libpanic_unwind/emcc.rs → library/panic_unwind/src/emcc.rs b/src/libpanic_unwind/emcc.rs → library/panic_unwind/src/emcc.rs
diff --git a/src/libpanic_unwind/gcc.rs → library/panic_unwind/src/gcc.rs b/src/libpanic_unwind/gcc.rs → library/panic_unwind/src/gcc.rs
diff --git a/src/libpanic_unwind/hermit.rs → library/panic_unwind/src/hermit.rs b/src/libpanic_unwind/hermit.rs → library/panic_unwind/src/hermit.rs
diff --git a/src/libpanic_unwind/lib.rs → library/panic_unwind/src/lib.rs b/src/libpanic_unwind/lib.rs → library/panic_unwind/src/lib.rs
diff --git a/src/libpanic_unwind/miri.rs → library/panic_unwind/src/miri.rs b/src/libpanic_unwind/miri.rs → library/panic_unwind/src/miri.rs
diff --git a/src/libpanic_unwind/seh.rs → library/panic_unwind/src/seh.rs b/src/libpanic_unwind/seh.rs → library/panic_unwind/src/seh.rs
diff --git a/src/libproc_macro/Cargo.toml → library/proc_macro/Cargo.toml b/src/libproc_macro/Cargo.toml → library/proc_macro/Cargo.toml
@@ -4,8 +4,5 @@ name = "proc_macro"
 version = "0.0.0"
 edition = "2018"
 
-[lib]
-path = "lib.rs"
-
 [dependencies]
-std = { path = "../libstd" }
+std = { path = "../std" }
diff --git a/src/libproc_macro/bridge/buffer.rs → library/proc_macro/src/bridge/buffer.rs b/src/libproc_macro/bridge/buffer.rs → library/proc_macro/src/bridge/buffer.rs
diff --git a/src/libproc_macro/bridge/client.rs → library/proc_macro/src/bridge/client.rs b/src/libproc_macro/bridge/client.rs → library/proc_macro/src/bridge/client.rs
diff --git a/src/libproc_macro/bridge/closure.rs → library/proc_macro/src/bridge/closure.rs b/src/libproc_macro/bridge/closure.rs → library/proc_macro/src/bridge/closure.rs
diff --git a/src/libproc_macro/bridge/handle.rs → library/proc_macro/src/bridge/handle.rs b/src/libproc_macro/bridge/handle.rs → library/proc_macro/src/bridge/handle.rs
diff --git a/src/libproc_macro/bridge/mod.rs → library/proc_macro/src/bridge/mod.rs b/src/libproc_macro/bridge/mod.rs → library/proc_macro/src/bridge/mod.rs
diff --git a/src/libproc_macro/bridge/rpc.rs → library/proc_macro/src/bridge/rpc.rs b/src/libproc_macro/bridge/rpc.rs → library/proc_macro/src/bridge/rpc.rs
diff --git a/src/libproc_macro/bridge/scoped_cell.rs → library/proc_macro/src/bridge/scoped_cell.rs b/src/libproc_macro/bridge/scoped_cell.rs → library/proc_macro/src/bridge/scoped_cell.rs
diff --git a/src/libproc_macro/bridge/server.rs → library/proc_macro/src/bridge/server.rs b/src/libproc_macro/bridge/server.rs → library/proc_macro/src/bridge/server.rs
diff --git a/src/libproc_macro/diagnostic.rs → library/proc_macro/src/diagnostic.rs b/src/libproc_macro/diagnostic.rs → library/proc_macro/src/diagnostic.rs
diff --git a/src/libproc_macro/lib.rs → library/proc_macro/src/lib.rs b/src/libproc_macro/lib.rs → library/proc_macro/src/lib.rs
diff --git a/src/libproc_macro/quote.rs → library/proc_macro/src/quote.rs b/src/libproc_macro/quote.rs → library/proc_macro/src/quote.rs
diff --git a/src/libproc_macro/tests/test.rs → library/proc_macro/tests/test.rs b/src/libproc_macro/tests/test.rs → library/proc_macro/tests/test.rs
diff --git a/src/libprofiler_builtins/Cargo.toml → library/profiler_builtins/Cargo.toml b/src/libprofiler_builtins/Cargo.toml → library/profiler_builtins/Cargo.toml
@@ -5,14 +5,12 @@ version = "0.0.0"
 edition = "2018"
 
 [lib]
-name = "profiler_builtins"
-path = "lib.rs"
 test = false
 bench = false
 doc = false
 
 [dependencies]
-core = { path = "../libcore" }
+core = { path = "../core" }
 compiler_builtins = { version = "0.1.0", features = ['rustc-dep-of-std'] }
 
 [build-dependencies]

diff --git a/src/libprofiler_builtins/build.rs → library/profiler_builtins/build.rs b/src/libprofiler_builtins/build.rs → library/profiler_builtins/build.rs
@@ -73,7 +73,7 @@ fn main() {
 
     // Note that this should exist if we're going to run (otherwise we just
     // don't build profiler builtins at all).
-    let root = Path::new("../llvm-project/compiler-rt");
+    let root = Path::new("../../src/llvm-project/compiler-rt");
 
     let src_root = root.join("lib").join("profile");
     for src in profile_sources {