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.23 and update bootstrap #45285

Merged
merged 2 commits into from
Oct 27, 2017
Merged

Conversation

alexcrichton
Copy link
Member

This commit updates the bootstrap compiler, bumps the version to 1.23, updates
Cargo, updates books, and updates crates.io dependencies

@rust-highfive
Copy link
Collaborator

r? @dtolnay

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

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2017
@Mark-Simulacrum
Copy link
Member

Some failures, but changes look good to me.

std/ops/index.html:67: broken link fragment `#operator-precedence` pointing to `reference/expressions/operator-expr.html`

[01:12:44] core/ops/index.html:67: broken link fragment `#operator-precedence` pointing to `reference/expressions/operator-expr.html`

[01:12:46] reference/print.html:292: broken link fragment `#non_ascii_idents` pointing to `reference/print.html`

[01:12:46] reference/print.html:304: broken link fragment `#non_ascii_idents` pointing to `reference/print.html`

[01:12:46] reference/print.html:1786: broken link fragment `#expresions.html#constant-expressions` pointing to `reference/print.html`

[01:12:46] reference/print.html:3884: broken link fragment `#visibility-and-privacy.html` pointing to `reference/print.html`

[01:12:46] reference/expressions/method-call-expr.html:163: broken link fragment `#visibility-and-privacy.html` pointing to `reference/expressions/method-call-expr.html`

[01:12:46] reference/identifiers.html:153: broken link fragment `#non_ascii_idents` pointing to `reference/identifiers.html`

[01:12:46] reference/identifiers.html:165: broken link fragment `#non_ascii_idents` pointing to `reference/identifiers.html`

[01:12:46] reference/expressions.html:193: broken link fragment `#path-expressions` pointing to `reference/expressions.html`

[01:12:46] reference/items/static-items.html:161: broken link fragment `#expresions.html#constant-expressions` pointing to `reference/items/static-items.html`

[01:12:48] thread 'main' panicked at 'found some broken links', /checkout/src/tools/linkchecker/main.rs:49:8

@bors
Copy link
Contributor

bors commented Oct 15, 2017

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

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 15, 2017
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 15, 2017

📌 Commit ff106f3 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 15, 2017
@kennytm
Copy link
Member

kennytm commented Oct 15, 2017

@bors r-

Cannot build clippy due to Cargo.lock issue.

Building stage2 tool clippy-driver (x86_64-unknown-linux-gnu)
[00:36:22] error: the lock file needs to be updated but --locked was passed to prevent this
[00:36:22] 
[00:36:22] 
[00:36:22] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/clippy/Cargo.toml"
[00:36:22] expected success, got: exit code: 101
[00:36:22] 
[00:36:22] 
[00:36:22] You can disable the tool in `src/tools/toolstate.toml`
[00:36:22] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap build
[00:36:22] Build completed unsuccessfully in 0:33:05
[00:36:22] make: *** [all] Error 1
[00:36:22] Makefile:22: recipe for target 'all' failed

@kennytm kennytm 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 Oct 15, 2017
@alexcrichton
Copy link
Member Author

Good lord here we go again...

@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 17, 2017

📌 Commit 2ba4fbf has been approved by Mark-Simulacrum

@alexcrichton
Copy link
Member Author

ping @Manishearth @llogiq @mcarton @oli-obk

This PR is currently going to break clippy. I believe the fix should be pretty easy though. Cargo on nightly is rewriting Cargo.lock to remove the [root] section, but in our containers and CI we've mounted the repository as read-only which means that we're failing on CI as we rewrite the Cargo.lock. The fix should basically be to just run cargo build in the clippy repository and commit the change to the lock file.

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 18, 2017
@oli-obk
Copy link
Contributor

oli-obk commented Oct 18, 2017

I removed the workspace and the Cargo.lock on clippy master: rust-lang/rust-clippy#2149

@alexcrichton
Copy link
Member Author

Ok thanks! I'll delay the update though until after this PR lands to hopefully ensure this doesn't conflict with too much

@bors
Copy link
Contributor

bors commented Oct 19, 2017

⌛ Testing commit 2ba4fbf7162b161b646c9d18f7f8a1156ddc4a4a with merge e72470ffcbe444080f270717f59495755cc87d7a...

@bors
Copy link
Contributor

bors commented Oct 19, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Oct 19, 2017

x86_64-gnu-incremental, the new stage0 bootstrap compiler ICE'd (#45161) when building unicode-xid 🤔

[00:00:52] error: internal compiler error: /checkout/src/librustc/ich/impls_ty.rs:78: TypeIdHasher: unexpected region ReLateBound(DebruijnIndex { depth: 1 }, "BrEnv")
[00:00:52] 
[00:00:52] note: the compiler unexpectedly panicked. this is a bug.
[00:00:52] 
[00:00:52] note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[00:00:52] 
[00:00:52] note: rustc 1.22.0-beta.1 (e694dd37b 2017-10-12) running on x86_64-unknown-linux-gnu
[00:00:52] 
[00:00:52] thread 'rustc' panicked at 'Box<Any>', /checkout/src/librustc_errors/lib.rs:492:8
[00:00:52] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:00:52] 
[00:00:52] error: Could not compile `unicode-xid`.

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 19, 2017
@kennytm kennytm removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 26, 2017
@bors
Copy link
Contributor

bors commented Oct 26, 2017

⌛ Testing commit ca18537 with merge 8a0e1497091ddb4f8e95576c2f19c7498372019f...

@bors
Copy link
Contributor

bors commented Oct 26, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Oct 27, 2017

dist-check failed. Fuchsia provided some more new BSD-3 packages again, legit.

Needs to update src/tools/tidy/src/deps.rs.

[00:11:23] invalid license BSD-3-Clause in /checkout/obj/build/tmp/distcheck/src/vendor/fuchsia-zircon/Cargo.toml
[00:11:23] invalid license BSD-3-Clause in /checkout/obj/build/tmp/distcheck/src/vendor/fuchsia-zircon-sys/Cargo.toml

@alexcrichton I've pushed that as 72e6257 since it's a relatively simple fix.

@kennytm kennytm 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 Oct 27, 2017
@kennytm
Copy link
Member

kennytm commented Oct 27, 2017

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 27, 2017

📌 Commit 72e6257 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 27, 2017
@bors
Copy link
Contributor

bors commented Oct 27, 2017

📌 Commit a513fff has been approved by Mark-Simulacrum

@alexcrichton
Copy link
Member Author

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 27, 2017

📌 Commit 72e6257 has been approved by Mark-Simulacrum

@alexcrichton
Copy link
Member Author

Sorry forced push by accident before I realized! I think I reverted it back and it should be good to go.

You're of course always more then welcome to help out, thanks so much!

The `zircon` crates have been renamed as `fuchsia-zircon`.
@kennytm
Copy link
Member

kennytm commented Oct 27, 2017

@bors r=Mark-Simulacrum

Looks like our interaction confused bors and the last r= was not registered 🤣. Anyway I've took the chance and removed the magenta exceptions as well (matching your changes).

@bors
Copy link
Contributor

bors commented Oct 27, 2017

📌 Commit 8ceacf4 has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 27, 2017

⌛ Testing commit 8ceacf4 with merge d9f1249...

bors added a commit that referenced this pull request Oct 27, 2017
Bump to 1.23 and update bootstrap

This commit updates the bootstrap compiler, bumps the version to 1.23, updates
Cargo, updates books, and updates crates.io dependencies
@bors
Copy link
Contributor

bors commented Oct 27, 2017

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

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.

8 participants