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.

Sign up for GitHub

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

Jump to bottom

Bump to 1.24.0 #46288

Merged
merged 1 commit into from
Dec 2, 2017
Merged

Bump to 1.24.0 #46288

merged 1 commit into from
Dec 2, 2017

Conversation

alexcrichton
Copy link
Member

  • Update the in-tree version number
  • Update the bootstrap compiler
  • Remove cfg(stage0) annotations
  • Update crate dependencies
  • Update Cargo itself

@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

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

Mark-Simulacrum
Mark-Simulacrum reviewed Nov 26, 2017
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me if you don't want to worry about rustfmt-nightly being duplicated. Feel free to just file an issue and cc me on it too.

src/Cargo.lock Outdated
@@ -2752,15 +2775,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
"checksum rustfmt-nightly 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "8cb7fea6f3c17082c41911b1de35e6585ebbf01f08435f07014f0327b56527b5"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like maybe something didn't quite resolve correctly here? We're depending on two versions of rustfmt with this -- one in-tree (I think) and one on crates.io. Technically not a problem, but maybe worth looking into?

scottmcm
scottmcm reviewed Nov 26, 2017
View reviewed changes
src/liballoc/boxed.rs Outdated
@@ -365,9 +362,6 @@ impl<T: ?Sized> Box<T> {
issue = "27730")]
#[inline]
pub fn into_unique(b: Box<T>) -> Unique<T> {
#[cfg(stage0)]
return unsafe { mem::transmute(b) };
#[cfg(not(stage0))]
return {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: looks like the return & {}s could be removed too

@joshtriplett
Copy link
Member

@Mark-Simulacrum is already reviewing, but this does LGTM.

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 27, 2017
@leoyvens
Copy link
Contributor

I think you missed the #[cfg_attr(stage0, lang = "send")] in libcore/marker.rs

@bors
Copy link
Contributor

bors commented Nov 27, 2017

☔ The latest upstream changes (presumably #44884) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Nov 29, 2017

📌 Commit 2bfaacc has been approved by Mark-Simulacrum

@kennytm kennytm 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 Nov 29, 2017
@bors
Copy link
Contributor

bors commented Nov 30, 2017

☔ The latest upstream changes (presumably #46144) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton
Update bootstrap compiler
a850bb0 
Also remove a number of `stage0` annotations and such
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Nov 30, 2017

📌 Commit a850bb0 has been approved by Mark-Simulacrum

bors added a commit that referenced this pull request Dec 2, 2017
@bors
Auto merge of #46288 - alexcrichton:bump-bootstrap, r=Mark-Simulacrum
c3942e7 
Bump to 1.24.0

* Update the in-tree version number
* Update the bootstrap compiler
* Remove `cfg(stage0)` annotations
* Update crate dependencies
* Update Cargo itself
@bors
Copy link
Contributor

bors commented Dec 2, 2017

⌛ Testing commit a850bb0 with merge c3942e7...

@bors
Copy link
Contributor

bors commented Dec 2, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing c3942e7 to master...

@bors bors merged commit a850bb0 into rust-lang:master Dec 2, 2017
This was referenced Dec 2, 2017
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scottmcm scottmcm scottmcm left review comments

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@alexcrichton @rust-highfive @joshtriplett @leoyvens @bors @Mark-Simulacrum @scottmcm @kennytm