-
Notifications
You must be signed in to change notification settings - Fork 13.5k
Update version of rustc-std-workspace-*
crates
#64320
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Merged
Merged
Conversation
This file contains hidden or 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
This commit updates the version of the `rustc-std-workspace-*` crates in-tree which are used in `[patch]`. This will guarantee that Cargo will select these versions even if minor updates are published to crates.io because otherwise a newer version on crates.io would be preferred which misses the point of `[patch]`!
(rust_highfive has picked a reviewer for you, use r? to override) |
Looks good to me! r=me if you think me reviewing this is good enough. |
@bors: r=RalfJung p=1 (raising priority to help fix this in the ecosystem) |
📌 Commit 6c74bc9 has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Sep 9, 2019
Update version of `rustc-std-workspace-*` crates This commit updates the version of the `rustc-std-workspace-*` crates in-tree which are used in `[patch]`. This will guarantee that Cargo will select these versions even if minor updates are published to crates.io because otherwise a newer version on crates.io would be preferred which misses the point of `[patch]`!
bors
added a commit
that referenced
this pull request
Sep 9, 2019
Rollup of 5 pull requests Successful merges: - #63806 (Upgrade rand to 0.7) - #64054 (Always emit unresolved import errors and hide unused import lint) - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583) - #64317 (Update LLVM submodule) - #64320 (Update version of `rustc-std-workspace-*` crates) Failed merges: r? @ghost
bors
added a commit
that referenced
this pull request
Sep 10, 2019
Rollup of 5 pull requests Successful merges: - #63806 (Upgrade rand to 0.7) - #64054 (Always emit unresolved import errors and hide unused import lint) - #64279 (Bump RLS and Rustfmt submodules to use rustc-ap-* v583) - #64317 (Update LLVM submodule) - #64320 (Update version of `rustc-std-workspace-*` crates) Failed merges: r? @ghost
Why did |
Good question. I don't know. |
I diffed both versions: $ diff -u ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.*/Cargo.toml
--- ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.0/Cargo.toml 1970-01-01 01:00:00.000000000 +0100
+++ ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.1/Cargo.toml 1970-01-01 01:00:00.000000000 +0100
@@ -12,9 +12,10 @@
[package]
name = "rustc-std-workspace-std"
-version = "1.0.0"
-authors = ["Charles Lew <crlf0710@gmail.com>"]
-description = "Explicitly empty crate for rust-lang/rust integration\n"
+version = "1.0.1"
+authors = ["Alex Crichton <alex@alexcrichton.com>"]
+description = "Workaround for rustbuild"
license = "MIT/Apache-2.0"
-[dependencies]
+[lib]
+name = "std"
$ diff -u ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.*/src/lib.rs
--- ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.0/src/lib.rs 2019-07-21 04:49:25.000000000 +0200
+++ ~/.cargo/registry/src/github.heygears.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.1/src/lib.rs 2019-09-09 17:52:02.000000000 +0200
@@ -0,0 +1 @@
+pub use std::*; Seems like it was transfering ownership and making it reexport the real libstd. |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
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 commit updates the version of the
rustc-std-workspace-*
cratesin-tree which are used in
[patch]
. This will guarantee that Cargo willselect these versions even if minor updates are published to crates.io
because otherwise a newer version on crates.io would be preferred which
misses the point of
[patch]
!