Don't put Cargo into the rustc workspace #40297
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @brson |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
This was referenced Mar 6, 2017
|
This likes like it's putting a submodule into src/vendor, which does not seem like a suitable place for submodules. Why src/vendor? Isn't this where the vendored sources live? |
|
Ah yeah unfortunately I could send a commit to Cargo with |
|
If the options are putting this in src/vendor or giving cargo its own workspace I prefer the latter. We wouldn't put all the other submodules into src/vendor, or the other tools, I think - istm src/vendor is purely for incidental dependencies, not for the actual tools that are part of Rust. |
|
Unfortunately I can't give Cargo it's own workspace due to CI errors caused by existing bugs in Cargo. That to me means the only solution is to put Cargo in some external directory for now. I hope to fix rust-lang/cargo#3192 soon though which I believe should allow us to get the "ideal" hierarchy in the future. @brson how do you feel about |
alexcrichton
force-pushed
the
fix-submodules
branch
from
44d84f3 to
a40e673
Compare
brson
reviewed
Mar 7, 2017
src/bootstrap/step.rs
Outdated
| @@ -559,7 +559,7 @@ pub fn build_rules<'a>(build: &'a Build) -> Rules { | |||
| rules.build("tool-qemu-test-client", "src/tools/qemu-test-client") | |||
| .dep(|s| s.name("libstd")) | |||
| .run(move |s| compile::tool(build, s.stage, s.target, "qemu-test-client")); | |||
| rules.build("tool-cargo", "src/tools/cargo") | |||
| rules.build("tool-cargo", "vendor/cargo") | |||
There was a problem hiding this comment.
Do you really mean "vendor/" here?
|
r=me with comment addressed |
alexcrichton
force-pushed
the
fix-submodules
branch
from
a40e673 to
b75116d
Compare
|
@bors: r=brson |
|
📌 Commit b75116d has been approved by |
|
For posterity, we decided to put cargo into a top-level dir for now. That's not scalable but we'll fix the bug in Cargo soon which prevents Cargo from going into a "proper" location. |
|
🔒 Merge conflict |
|
@bors: retry |
frewsxcv
added a commit
to frewsxcv/rust
that referenced
this pull request
Mar 9, 2017
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
|
@bors: p=1 We're not getting nightlies because of this |
|
🔒 Merge conflict |
|
@bors: retry |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 10, 2017
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
arielb1
pushed a commit
to arielb1/rust
that referenced
this pull request
Mar 10, 2017
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to the top directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace.
alexcrichton
force-pushed
the
fix-submodules
branch
from
7688222 to
c65996e
Compare
|
@bors: r=brson |
|
📌 Commit c65996e has been approved by |
alexcrichton
added a commit
to alexcrichton/rust
that referenced
this pull request
Mar 11, 2017
Don't put Cargo into the rustc workspace This causes problems when first cloning and bootstrapping the repository unfortunately, so let's ensure that Cargo sticks around in its own workspace. Because Cargo is a submodule it's not available by default on the inital clone of the rust-lang/rust repository. Normally it's the responsibility of the rustbuild to take care of this, but unfortunately to build rustbuild itself we need to resolve the workspace conflicts. To deal with this we'll just have to ensure that all submodules are in their own workspace, which sort of makes sense anyway as updates to dependencies as bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any case this commit removes Cargo from the global workspace which should resolve the issues that we've been seeing. To actually perform this the `cargo` submodule has been moved to a new `vendor` directory to ensure it's outside the scope of `src/Cargo.toml` as a workspace. Closes rust-lang#40284
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
|
⌛ Testing commit c65996e with merge ee972fd... |
|
@bors: retry |
|
⌛ Testing commit c65996e with merge 3070712... |
|
@bors: retry |
bors
added a commit
that referenced
this pull request
Mar 11, 2017
Rollup of 38 pull requests - Successful merges: #39202, #39820, #39918, #39921, #40092, #40146, #40199, #40225, #40239, #40257, #40259, #40261, #40277, #40278, #40287, #40297, #40311, #40315, #40319, #40324, #40336, #40340, #40344, #40345, #40367, #40369, #40372, #40373, #40379, #40385, #40386, #40389, #40400, #40404, #40410, #40422, #40423, #40424 - Failed merges: #40220, #40329, #40426
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This causes problems when first cloning and bootstrapping the repository
unfortunately, so let's ensure that Cargo sticks around in its own workspace.
Because Cargo is a submodule it's not available by default on the inital clone
of the rust-lang/rust repository. Normally it's the responsibility of the
rustbuild to take care of this, but unfortunately to build rustbuild itself we
need to resolve the workspace conflicts.
To deal with this we'll just have to ensure that all submodules are in their own
workspace, which sort of makes sense anyway as updates to dependencies as
bugfixes to Cargo should go to rust-lang/cargo instead of rust-lang/rust. In any
case this commit removes Cargo from the global workspace which should resolve
the issues that we've been seeing.
To actually perform this the
cargosubmodule has been moved to a newvendordirectory to ensure it's outside the scope of
src/Cargo.tomlas a workspace.Closes #40284