Skip to content

Bump to 1.39 #63534

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 4 commits into from
Aug 15, 2019
Merged

Bump to 1.39 #63534

merged 4 commits into from
Aug 15, 2019

Conversation

Mark-Simulacrum
Copy link
Member

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 13, 2019
let cfg_not_bootstrap = stage != "0" && crate_name != Some("rustc_version");
if cfg_not_bootstrap && use_internal_lints(crate_name) {
// `rustc_version` mis-reports the `stage`.
if crate_name != Some("rustc_version") && use_internal_lints(crate_name) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The "rustc_version" part was also supposed to be removed during the bump.
("Mis-reports the stage" means reporting "not bootstrap" while it was actually "bootstrap".)

Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

cfg(bootstrap) related changes look good aside from @petrochenkov's note.

r=me when-green with that fixed

@Mark-Simulacrum
Copy link
Member Author

@bors r=Centril p=10

@bors
Copy link
Collaborator

bors commented Aug 14, 2019

📌 Commit 28d2279 has been approved by Centril

@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 Aug 14, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 14, 2019
Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

Seems like hashbrown is using mem::uninitialized making the bootstrap bump here fail in #63541 (comment)... @bors r-

cc @Amanieu

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 14, 2019
@Amanieu
Copy link
Member

Amanieu commented Aug 14, 2019

@Centril The errors in the log don't seem to have anything to do with hashbrown?

Mark-Simulacrum and others added 3 commits August 14, 2019 05:39
This is needed to permit us building core_arch which is a submodule dep
(so we can't snap it to the new beta compiler).
@Mark-Simulacrum
Copy link
Member Author

Yeah, I think that's just cloudabi. Fixed (I think).

@bors r=Centril

@bors
Copy link
Collaborator

bors commented Aug 14, 2019

📌 Commit f7ff36d has been approved by Centril

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors p=50

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

@bors retry rolled up

bors added a commit that referenced this pull request Aug 14, 2019
Rollup of 10 pull requests

Successful merges:

 - #62984 (Add lint for excess trailing semicolons)
 - #63075 (Miri: Check that a ptr is aligned and inbounds already when evaluating `*`)
 - #63490 (libsyntax: cleanup and refactor `pat.rs`)
 - #63495 ( Remove redundant `ty` fields from `mir::Constant` and `hair::pattern::PatternRange`.)
 - #63509 (Point at the right enclosing scope when using `await` in non-async fn)
 - #63528 (syntax: Remove `DummyResult::expr_only`)
 - #63534 (Bump to 1.39)
 - #63537 (expand: Unimplement `MutVisitor` on `MacroExpander`)
 - #63542 (Add NodeId for Arm, Field and FieldPat)
 - #63560 (move test that shouldn't be in test/run-pass/)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Aug 14, 2019

⌛ Testing commit f7ff36d with merge 260c22c85d162bdc9cf938d0da7dbb77c823a7e3...

Centril added a commit to Centril/rust that referenced this pull request Aug 14, 2019
@Centril
Copy link
Contributor

Centril commented Aug 14, 2019

@bors retry rolled up

@bors
Copy link
Collaborator

bors commented Aug 14, 2019

⌛ Testing commit f7ff36d with merge 082cf2f...

bors added a commit that referenced this pull request Aug 14, 2019
@bors
Copy link
Collaborator

bors commented Aug 15, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 082cf2f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 15, 2019
@bors bors merged commit f7ff36d into rust-lang:master Aug 15, 2019
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #63534!

Tested on commit 082cf2f.
Direct link to PR: #63534

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Aug 15, 2019
Tested on commit rust-lang/rust@082cf2f.
Direct link to PR: <rust-lang/rust#63534>

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
Centril added a commit to Centril/rust that referenced this pull request Aug 16, 2019
… r=alexreg

libcore: more cleanups using `#![feature(associated_type_bounds)]`

Turns out this was indeed a bootstrapping issue from a test with `./x.py check` locally after rust-lang#63534 merged.

Closes rust-lang#63393

r? @alexreg
cc @iluuu1994
cc rust-lang#52662
@mati865 mati865 mentioned this pull request Sep 4, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the stage0-bump branch November 10, 2021 20:28
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

8 participants