Skip to content

Commit 882ff7d

Browse files
committed
move Cargo.toml to live alongside x.py
1 parent c83fa5d commit 882ff7d

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed
File renamed without changes.
Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
[workspace]
22
members = [
3-
"bootstrap",
4-
"rustc",
5-
"libstd",
6-
"libtest",
7-
"librustc_trans",
8-
"tools/cargotest",
9-
"tools/clippy",
10-
"tools/compiletest",
11-
"tools/error_index_generator",
12-
"tools/linkchecker",
13-
"tools/rustbook",
14-
"tools/unstable-book-gen",
15-
"tools/tidy",
16-
"tools/build-manifest",
17-
"tools/remote-test-client",
18-
"tools/remote-test-server",
19-
"tools/rust-installer",
20-
"tools/cargo",
21-
"tools/rustdoc",
22-
"tools/rls",
23-
"tools/rustfmt",
24-
"tools/miri",
25-
"tools/rustdoc-themes",
3+
"src/bootstrap",
4+
"src/rustc",
5+
"src/libstd",
6+
"src/libtest",
7+
"src/librustc_trans",
8+
"src/tools/cargotest",
9+
"src/tools/clippy",
10+
"src/tools/compiletest",
11+
"src/tools/error_index_generator",
12+
"src/tools/linkchecker",
13+
"src/tools/rustbook",
14+
"src/tools/unstable-book-gen",
15+
"src/tools/tidy",
16+
"src/tools/build-manifest",
17+
"src/tools/remote-test-client",
18+
"src/tools/remote-test-server",
19+
"src/tools/rust-installer",
20+
"src/tools/cargo",
21+
"src/tools/rustdoc",
22+
"src/tools/rls",
23+
"src/tools/rustfmt",
24+
"src/tools/miri",
25+
"src/tools/rustdoc-themes",
2626
# FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
27-
"tools/rls/test_data/bin_lib",
28-
"tools/rls/test_data/borrow_error",
29-
"tools/rls/test_data/common",
30-
"tools/rls/test_data/deglob",
31-
"tools/rls/test_data/features",
32-
"tools/rls/test_data/find_all_refs_no_cfg_test",
33-
"tools/rls/test_data/find_impls",
34-
"tools/rls/test_data/infer_bin",
35-
"tools/rls/test_data/infer_custom_bin",
36-
"tools/rls/test_data/infer_lib",
37-
"tools/rls/test_data/multiple_bins",
38-
"tools/rls/test_data/reformat",
39-
"tools/rls/test_data/reformat_with_range",
40-
"tools/rls/test_data/workspace_symbol",
27+
"src/tools/rls/test_data/bin_lib",
28+
"src/tools/rls/test_data/borrow_error",
29+
"src/tools/rls/test_data/common",
30+
"src/tools/rls/test_data/deglob",
31+
"src/tools/rls/test_data/features",
32+
"src/tools/rls/test_data/find_all_refs_no_cfg_test",
33+
"src/tools/rls/test_data/find_impls",
34+
"src/tools/rls/test_data/infer_bin",
35+
"src/tools/rls/test_data/infer_custom_bin",
36+
"src/tools/rls/test_data/infer_lib",
37+
"src/tools/rls/test_data/multiple_bins",
38+
"src/tools/rls/test_data/reformat",
39+
"src/tools/rls/test_data/reformat_with_range",
40+
"src/tools/rls/test_data/workspace_symbol",
4141
]
4242

4343
# Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -63,12 +63,12 @@ debug-assertions = false
6363
# so we use a `[patch]` here to override the github repository with our local
6464
# vendored copy.
6565
[patch."https://github.com/rust-lang/cargo"]
66-
cargo = { path = "tools/cargo" }
66+
cargo = { path = "src/tools/cargo" }
6767

6868
[patch.crates-io]
6969
# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
7070
# that we're shipping as well (to ensure that the rustfmt in RLS and the
7171
# `rustfmt` executable are the same exact vesion). Unlike Cargo, however, the
7272
# RLS depends on `rustfmt` from crates.io, so we put this in a `[patch]` section
7373
# for crates.io
74-
rustfmt-nightly = { path = "tools/rustfmt" }
74+
rustfmt-nightly = { path = "src/tools/rustfmt" }

0 commit comments

Comments
 (0)