Skip to content

Bump to 1.24.0 - #46288

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:bump-bootstrap
Dec 2, 2017
Merged

Bump to 1.24.0#46288
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:bump-bootstrap

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented Nov 26, 2017

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

@alexcrichton

alexcrichton commented Nov 26, 2017

Copy link
Copy Markdown
MemberAuthor

r? @Mark-Simulacrum

@rust-highfive

rust-highfive commented Nov 26, 2017

Copy link
Copy Markdown
Contributor

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

@Mark-SimulacrumMark-Simulacrum left a comment

Copy link
Copy Markdown
Member

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.

Comment threadsrc/Cargo.lock Outdated

@Mark-SimulacrumMark-SimulacrumNov 26, 2017

Copy link
Copy Markdown
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
Comment threadsrc/liballoc/boxed.rs Outdated

@scottmcmscottmcmNov 26, 2017

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

joshtriplett commented Nov 27, 2017

Copy link
Copy Markdown
Member

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

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

leoyvens commented Nov 27, 2017

Copy link
Copy Markdown
Contributor

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

@bors

bors commented Nov 27, 2017

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

alexcrichton commented Nov 29, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r=Mark-Simulacrum

@bors

bors commented Nov 29, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 2bfaacc has been approved by Mark-Simulacrum

@kennytmkennytm 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

bors commented Nov 30, 2017

Copy link
Copy Markdown
Collaborator

☔ 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

alexcrichton commented Nov 30, 2017

Copy link
Copy Markdown
MemberAuthor

@bors: r=Mark-Simulacrum

@bors

bors commented Nov 30, 2017

Copy link
Copy Markdown
Collaborator

📌 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

bors commented Dec 2, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a850bb0 with merge c3942e7...

@bors

bors commented Dec 2, 2017

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

@Mark-SimulacrumMark-SimulacrumMark-Simulacrum left review comments
@scottmcmscottmcmscottmcm left review comments

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

S-waiting-on-borsStatus: 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