Rollup merge of rust-lang#48236 - nikomatsakis:colocate-x-py-and-carg…

…o-toml, r=alexcrichton

move Cargo.toml to live alongside x.py

This makes it so that, when you `./x.py`, you get errors relative to the location of `x.py`. I would also be fine with moving `x.py` into `src`, if that is deemed preferable. (Is this a good idea?) One of the other seems to make sense to me, but I'm curious what others think. =)

r? @alexcrichton
cc @pnkfelix

(I suppose one could also run `../x.py` from the `src` directory, but then that creates `src/build` directory, which I don't particularly like.)

(Also, this is only minimally tested.)

src/Cargo.toml → Cargo.toml

@@ -1,43 +1,43 @@
 [workspace]
 members = [
-  "bootstrap",
-  "rustc",
-  "libstd",
-  "libtest",
-  "librustc_trans",
-  "tools/cargotest",
-  "tools/clippy",
-  "tools/compiletest",
-  "tools/error_index_generator",
-  "tools/linkchecker",
-  "tools/rustbook",
-  "tools/unstable-book-gen",
-  "tools/tidy",
-  "tools/build-manifest",
-  "tools/remote-test-client",
-  "tools/remote-test-server",
-  "tools/rust-installer",
-  "tools/cargo",
-  "tools/rustdoc",
-  "tools/rls",
-  "tools/rustfmt",
-  "tools/miri",
-  "tools/rustdoc-themes",
+  "src/bootstrap",
+  "src/rustc",
+  "src/libstd",
+  "src/libtest",
+  "src/librustc_trans",
+  "src/tools/cargotest",
+  "src/tools/clippy",
+  "src/tools/compiletest",
+  "src/tools/error_index_generator",
+  "src/tools/linkchecker",
+  "src/tools/rustbook",
+  "src/tools/unstable-book-gen",
+  "src/tools/tidy",
+  "src/tools/build-manifest",
+  "src/tools/remote-test-client",
+  "src/tools/remote-test-server",
+  "src/tools/rust-installer",
+  "src/tools/cargo",
+  "src/tools/rustdoc",
+  "src/tools/rls",
+  "src/tools/rustfmt",
+  "src/tools/miri",
+  "src/tools/rustdoc-themes",
   # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude
-  "tools/rls/test_data/bin_lib",
-  "tools/rls/test_data/borrow_error",
-  "tools/rls/test_data/common",
-  "tools/rls/test_data/deglob",
-  "tools/rls/test_data/features",
-  "tools/rls/test_data/find_all_refs_no_cfg_test",
-  "tools/rls/test_data/find_impls",
-  "tools/rls/test_data/infer_bin",
-  "tools/rls/test_data/infer_custom_bin",
-  "tools/rls/test_data/infer_lib",
-  "tools/rls/test_data/multiple_bins",
-  "tools/rls/test_data/reformat",
-  "tools/rls/test_data/reformat_with_range",
-  "tools/rls/test_data/workspace_symbol",
+  "src/tools/rls/test_data/bin_lib",
+  "src/tools/rls/test_data/borrow_error",
+  "src/tools/rls/test_data/common",
+  "src/tools/rls/test_data/deglob",
+  "src/tools/rls/test_data/features",
+  "src/tools/rls/test_data/find_all_refs_no_cfg_test",
+  "src/tools/rls/test_data/find_impls",
+  "src/tools/rls/test_data/infer_bin",
+  "src/tools/rls/test_data/infer_custom_bin",
+  "src/tools/rls/test_data/infer_lib",
+  "src/tools/rls/test_data/multiple_bins",
+  "src/tools/rls/test_data/reformat",
+  "src/tools/rls/test_data/reformat_with_range",
+  "src/tools/rls/test_data/workspace_symbol",
 ]
 
 # Curiously, compiletest will segfault if compiled with opt-level=3 on 64-bit
@@ -63,12 +63,12 @@ debug-assertions = false
 # so we use a `[patch]` here to override the github repository with our local
 # vendored copy.
 [patch."https://github.com/rust-lang/cargo"]
-cargo = { path = "tools/cargo" }
+cargo = { path = "src/tools/cargo" }
 
 [patch.crates-io]
 # Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
 # that we're shipping as well (to ensure that the rustfmt in RLS and the
 # `rustfmt` executable are the same exact vesion). Unlike Cargo, however, the
 # RLS depends on `rustfmt` from crates.io, so we put this in a `[patch]` section
 # for crates.io
-rustfmt-nightly = { path = "tools/rustfmt" }
+rustfmt-nightly = { path = "src/tools/rustfmt" }