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 bootstrap to 1.60 #94290

Merged
merged 4 commits into from
Feb 25, 2022
Merged

Bump bootstrap to 1.60 #94290

merged 4 commits into from
Feb 25, 2022

Conversation

Mark-Simulacrum
Copy link
Member

This bumps the bootstrap compiler to 1.60 and cleans up cfgs and Span's rustc_pass_by_value (enabled by the bootstrap bump).

@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 23, 2022
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/clippy.

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

@Mark-Simulacrum: no appropriate reviewer found, use r? to override

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 23, 2022
@Mark-Simulacrum
Copy link
Member Author

r? @pietroalbini (but anyone can feel free to steal)

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pietroalbini
Copy link
Member

r=me

@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini rollup=never

@bors
Copy link
Contributor

bors commented Feb 23, 2022

📌 Commit bdbe0a60b036a2779e981f6a665f7e7c1cfe7ce4 has been approved by pietroalbini

@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 Feb 23, 2022
@Urgau Urgau mentioned this pull request Feb 23, 2022
Merged
@bors
Copy link
Contributor

bors commented Feb 24, 2022

⌛ Testing commit bdbe0a60b036a2779e981f6a665f7e7c1cfe7ce4 with merge e94a89f16b721e5906a0cd627e61d9cd264a1cca...

@bors
Copy link
Contributor

bors commented Feb 24, 2022

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 24, 2022
@mati865
Copy link
Contributor

mati865 commented Feb 24, 2022

CI error:

warning: spurious network error (1 tries remaining): failed to get 200 response from `[https://crates.io/api/v1/crates/libc/0.2.116/download`,](https://crates.io/api/v1/crates/libc/0.2.116/download%60,) got 502

@c410-f3r
Copy link
Contributor

crates.io is having some problems

@Mark-Simulacrum
Copy link
Member Author

@bors retry

@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 Feb 24, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Feb 24, 2022
Closed
@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Feb 24, 2022

📌 Commit 27d61eabf3f25b8b2324e9d550bd11b01f126889 has been approved by pietroalbini

@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Feb 24, 2022

📌 Commit bcf6f1c625b4311b17d8fb235172d52a938fad8b has been approved by pietroalbini

nbdd0121
nbdd0121 reviewed Feb 24, 2022
View reviewed changes
library/core/src/panicking.rs Outdated
@@ -84,8 +84,12 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
panic!("index out of bounds: the len is {} but the index is {}", len, index)
}

// This function is called directly by the codegen backend, and must not have
// any extra arguments (including those synthesized by track_caller). It should
// also not be called by regular Rust code.
Copy link
Contributor

Choose a reason for hiding this comment

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

It's okay to call this in regular Rust code, it's just that it doesn't really make much sense.

@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Feb 24, 2022

📌 Commit 566f9ded078b0b2e4d629a6bfa9dc9b753fb440a has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Feb 25, 2022

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

@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 Feb 25, 2022
@c410-f3r c410-f3r mentioned this pull request Feb 25, 2022
Merged
@Mark-Simulacrum
Bump bootstrap to 1.60
ea65f50
@Mark-Simulacrum
Switch bootstrap cfgs
22c3a71
@Mark-Simulacrum
Enable rustc_pass_by_value for Span
76b13c9
@Mark-Simulacrum
Re-add track_caller to panic_no_unwind in bootstrap
3c62f2f 
This function was updated in a recent PR (92911) to be called without the caller
information passed in, but the function signature itself was not altered with
cfg_attr at the time.
@Mark-Simulacrum
Copy link
Member Author

@bors r=pietroalbini -- rebased

@bors
Copy link
Contributor

bors commented Feb 25, 2022

📌 Commit 3c62f2f has been approved by pietroalbini

@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 Feb 25, 2022
@bors
Copy link
Contributor

bors commented Feb 25, 2022

⌛ Testing commit 3c62f2f with merge d981633...

@bors
Copy link
Contributor

bors commented Feb 25, 2022

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing d981633 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 25, 2022
@bors bors merged commit d981633 into rust-lang:master Feb 25, 2022
@rustbot rustbot added this to the 1.61.0 milestone Feb 25, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d981633): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@nbdd0121 nbdd0121 nbdd0121 left review comments

@eddyb eddyb eddyb left review comments

Assignees

@pietroalbini pietroalbini

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.