Update crates in Cargo.lock
#51917
Update crates in Cargo.lock
#51917
Conversation
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
r? @kennytm |
This comment has been minimized.
This comment has been minimized.
kennytm
added
S-waiting-on-author
|
Can't use |
|
The problem is that we build libraries like this with a freshly compiled stage0 libstd which is not compiled with stdsimd, because we want to be able to change simd implementations without worrying about the bootstrap compiler. I think the best solution here is to change how we build these libraries such that they are compiled with the raw bootstrap compiler, essentially equivalent to |
|
My thoughts exactly! I've pushed up a commit to do that, and let's see how it fares |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
|
☔ The latest upstream changes (presumably #51717) made this pull request unmergeable. Please resolve the merge conflicts. |
alexcrichton
force-pushed
the
update
branch
2 times, most recently
from
c2146f7
to
f19f2ac
Compare
|
Ok should be fixed now! |
src/bootstrap/lib.rs
Outdated
| /// "other" here is for miscellaneous sets of tools that are built using the | ||
| /// stage0 compiler in its entirety (target libraries and all). Typically | ||
| /// these tools compile with stable Rust. | ||
| ToolOther, |
There was a problem hiding this comment.
Could we rename this to ToolBootstrap and update the comment above to say "bootstrap compiler" instead of stage0 compiler to avoid the potential ambiguity?
src/bootstrap/lib.rs
Outdated
| /// Compile a tool which uses all libraries we compile (up to rustc). | ||
| /// Doesn't use the stage0 compiler libraries like "other", and includes | ||
| /// tools like rustdoc, cargo, rls, etc. | ||
| ToolAllLocalLibs, |
There was a problem hiding this comment.
I'd prefer that we keep the split here between ToolStd/Test/Rustc since I'm hoping to use it later for #50509 -- we want to keep Mode closely matched with dependency information where possible.
Looking through this though it looks like we'd only need to keep ToolRustc in that case (the rest would appear unused); mind renaming this to that? It would help in future tool additions too, I think, since the distinction we're making is between tools that have dependencies beyond a beta compiler; should also enable fewer rebuilds for some tools...
src/bootstrap/lib.rs
Outdated
| @@ -547,7 +553,7 @@ impl Build { | |||
| Mode::Test => "-test", | |||
| Mode::Codegen => "-rustc", | |||
| Mode::Rustc => "-rustc", | |||
| Mode::ToolStd | Mode::ToolTest | Mode::ToolRustc => "-tools", | |||
| Mode::ToolOther | Mode::ToolAllLocalLibs => "-tools", | |||
There was a problem hiding this comment.
This seems like a bad idea -- likely to cause problems: tools built with different std's will conflict and generally not work, we should have a -bootstrap-tools dir for them probably.
(That'll also mean updating the cleaning code, I think, since it shouldn't need to clean out that dir except on bootstrap compiler change)
|
@Mark-Simulacrum ok applied changes, although are you sure the cleaning needs to be updated? I've double-checked that cleaning happens for the |
|
Looking at it again I don't think it needs to be, and I guess people can file bugs if we're wrong :) @bors r+ |
|
📌 Commit 13d15ea88d1ab34920eabaf61b0b1c6cdf2c1bbb has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 13d15ea88d1ab34920eabaf61b0b1c6cdf2c1bbb with merge a815e2997bc9561a4ebafb3ca160a30295ce036d... |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@bors retry |
bors
added
S-waiting-on-bors
|
⌛ Testing commit 66273e622abf5df74efa213f3729bb99f54a7c37 with merge 5efb980ef0cd7fa54ad72922e3219830fb27f485... |
|
💔 Test failed - status-appveyor |
bors
added
S-waiting-on-review
|
Legit ( |
kennytm
added
S-waiting-on-author
Run `cargo update` and let's see how far we can get!
|
@bors: r=Mark-Simulacrum |
|
📌 Commit d825115 has been approved by |
bors
added
S-waiting-on-bors
Update crates in `Cargo.lock` This is a "hopefully routine" update of our crates.io-based crates in `Cargo.lock`, and let's see how it fares on CI...
|
☀️ Test successful - status-appveyor, status-travis |
|
Looks like it broke custom libdir support. |
Revert some changes from rust-lang#51917 to fix custom libdir Should fix rust-lang#52317 also adds `libdir` value to output.
Rollup of 13 pull requests Successful merges: - #51628 (use checked write in `LineWriter` example) - #52116 (Handle array manually in str case conversion methods) - #52218 (Amend option.take examples) - #52418 (Do not use desugared ident when suggesting adding a type) - #52439 (Revert some changes from #51917 to fix custom libdir) - #52455 (Fix doc comment: use `?` instead of `.unwrap()`) - #52458 (rustc: Fix a suggestion for the `proc_macro` feature) - #52464 (Allow clippy to be installed with make install) - #52472 (rustc: Enable `use_extern_macros` in 2018 edition) - #52477 (Clarify short-circuiting behvaior of Iterator::zip.) - #52480 (Cleanup #24958) - #52487 (Don't build twice the sanitizers on Linux) - #52510 (rustdoc: remove FIXME about macro redirects) Failed merges: r? @ghost
This is a "hopefully routine" update of our crates.io-based crates in
Cargo.lock, and let's see how it fares on CI...