Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version of rustc-std-workspace-* crates #64320

Merged
merged 1 commit into from
Sep 10, 2019

Conversation

alexcrichton
Copy link
Member

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]!

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
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 9, 2019
@RalfJung
Copy link
Member

RalfJung commented Sep 9, 2019

Looks good to me! r=me if you think me reviewing this is good enough.

@alexcrichton
Copy link
Member Author

@bors: r=RalfJung p=1

(raising priority to help fix this in the ecosystem)

@bors
Copy link
Contributor

bors commented Sep 9, 2019

📌 Commit 6c74bc9 has been approved by RalfJung

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 9, 2019
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
@bors bors merged commit 6c74bc9 into rust-lang:master Sep 10, 2019
@bjorn3
Copy link
Member

bjorn3 commented Sep 10, 2019

Why did rustc-std-workspace-std get a version 1.0.1?

@RalfJung
Copy link
Member

Good question. I don't know.

@bjorn3
Copy link
Member

bjorn3 commented Sep 16, 2019

I diffed both versions:

$ diff -u ~/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.*/Cargo.toml
--- ~/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.0/Cargo.toml        1970-01-01 01:00:00.000000000 +0100
+++ ~/.cargo/registry/src/github.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.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.*/src/lib.rs
--- ~/.cargo/registry/src/github.com-1ecc6299db9ec823/rustc-std-workspace-std-1.0.0/src/lib.rs        2019-07-21 04:49:25.000000000 +0200
+++ ~/.cargo/registry/src/github.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.

@alexcrichton alexcrichton deleted the update-patch branch September 20, 2019 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants