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

Bump to 1.39 #63534

Merged
merged 4 commits into from Aug 15, 2019

Conversation

@Mark-Simulacrum
Copy link
Member

commented Aug 13, 2019

r? @Centril

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) {

This comment has been minimized.

Copy link
@petrochenkov

petrochenkov Aug 13, 2019

Contributor

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".)

@Centril
Copy link
Member

left a comment

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

r=me when-green with that fixed

@Mark-Simulacrum Mark-Simulacrum force-pushed the Mark-Simulacrum:stage0-bump branch from c41e394 to 28d2279 Aug 13, 2019

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

@bors r=Centril p=10

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

📌 Commit 28d2279 has been approved by Centril

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 14, 2019

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63540 - Mark-Simulacrum:rollup-t0qq657, r=Mark-Simulacrum
Rollup of 11 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63488 (improve DiagnosticBuilder docs)
 - #63491 (Update RLS)
 - #63534 (Bump to 1.39)

Failed merges:

 - #63487 (Remove meaningless comments in src/test)

r? @ghost

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

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63541 - Centril:rollup-d3q7074, r=Centril
Rollup of 16 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63486 (Document `From` trait for `BinaryHeap`)
 - #63488 (improve DiagnosticBuilder docs)
 - #63493 (Remove unneeded comment in src/libcore/hash/mod.rs)
 - #63499 (handle elision in async fn correctly)
 - #63501 (use `ParamName` to track in-scope lifetimes instead of Ident)
 - #63512 (Provide map_ok and map_err method for Poll<Option<Result<T, E>>>)
 - #63529 (RELEASES.md: ? is one of three Kleene operators)
 - #63530 (Fix typo in error message.)
 - #63534 (Bump to 1.39)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

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

cc @Amanieu

@Amanieu

This comment has been minimized.

Copy link
Contributor

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 some commits Aug 11, 2019

Disable --cfg bootstrap in libcore
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 Mark-Simulacrum force-pushed the Mark-Simulacrum:stage0-bump branch from 28d2279 to f7ff36d Aug 14, 2019

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

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

@bors r=Centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

📌 Commit f7ff36d has been approved by Centril

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

@bors p=50

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63557 - Centril:rollup-r1c65e7, r=Centril
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 `*`)
 - #63175 (rustc: implement argsfiles for command line)
 - #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)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

⌛️ Testing commit f7ff36d with merge a168d10...

bors added a commit that referenced this pull request Aug 14, 2019

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

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

@bors retry rolled up

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63563 - Centril:rollup-j9nld0c, r=Centril
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

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

⌛️ Testing commit f7ff36d with merge 260c22c...

bors added a commit that referenced this pull request Aug 14, 2019

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

@Centril

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

@bors retry rolled up

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63571 - Centril:rollup-v2rciiu, r=Centril
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`.)
 - #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/)
 - #63570 (Adjust tracking issues for `MaybeUninit<T>` gates)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 14, 2019

⌛️ Testing commit f7ff36d with merge 082cf2f...

bors added a commit that referenced this pull request Aug 14, 2019

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 15, 2019

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

@bors bors added the merged-by-bors label Aug 15, 2019

@bors bors merged commit f7ff36d into rust-lang:master Aug 15, 2019

5 checks passed

homu Test successful
Details
pr Build #20190814.18 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 15, 2019

📣 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

📣 Toolstate changed by rust-lang/rust#63534!
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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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

Rollup merge of rust-lang#63584 - Centril:cleanup-core-with-more-atb,…
… 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.