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 nightly version to 1.52.0 #81792

Merged
merged 2 commits into from
Feb 6, 2021
Merged

Conversation

pietroalbini
Copy link
Member

cc @rust-lang/release

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, 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 5, 2021
@pietroalbini
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 5, 2021

📌 Commit c51e432 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 5, 2021
@bors
Copy link
Contributor

bors commented Feb 5, 2021

⌛ Testing commit c51e432 with merge fa79c8ba8f9acbde2784368b71d7d2e905343f82...

@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
 Success!
 

The actual stderr differed from the expected stderr.
Actual stderr saved to /tmp/compiletestY7Q69H/panic/catch_panic.stderr
To update references, run this command from build directory:
tests/run-pass/update-references.sh '/tmp/compiletestY7Q69H' 'panic/catch_panic.rs'
error: 1 errors occurred comparing output.
status: exit code: 0
status: exit code: 0
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin/miri" "tests/run-pass/panic/catch_panic.rs" "-L" "/tmp/compiletestY7Q69H" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "-C" "prefer-dynamic" "-o" "/tmp/compiletestY7Q69H/panic/catch_panic.stage-id" "-A" "unused" "--edition" "2018" "-Astable-features" "--sysroot" "/home/user/.cache/miri/HOST" "-Zmiri-symbolic-alignment-check" "-L" "/tmp/compiletestY7Q69H/panic/catch_panic.stage-id.aux"
------------------------------------------

------------------------------------------
stderr:
---

failures:

---- check_that_clippy_has_the_same_major_version_as_rustc stdout ----
thread 'check_that_clippy_has_the_same_major_version_as_rustc' panicked at 'assertion failed: `(left == right)`
  left: `"51"`,
 right: `"52"`: clippy patch version does not equal rustc minor version', src/tools/clippy/tests/versioncheck.rs:61:13


failures:
    check_that_clippy_has_the_same_major_version_as_rustc

@bors
Copy link
Contributor

bors commented Feb 5, 2021

💔 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 5, 2021
@Mark-Simulacrum
Copy link
Member

@rust-lang/clippy -- it looks like this is a new test added to ensure clippy's version matches rustc's -- for now, can someone provide instructions on the right set of steps to take? In the future it would be great to ping me / release team if you're adding tests that are affected by version numbers and might cause problems during our release cycle.

If we don't hear back by Saturday evening I'm probably going to just disable these tests for now since we need this PR to land.

@matthiaskrgr
Copy link
Member

matthiaskrgr commented Feb 5, 2021

Sorry about that, this is my fault.
Original clippy ticket: rust-lang/rust-clippy#6499
Impl pr: rust-lang/rust-clippy#6526

Test location: https://github.com/rust-lang/rust-clippy/blob/master/tests/versioncheck.rs

Basically with rust turning 1.52.0, the clippy version will need to be 0.1.52.

If you bump the versions (in the subrepo) at
https://github.com/rust-lang/rust-clippy/blob/a507c27660d05f37307369d30bee9e82ce3a11e1/Cargo.toml#L3
and
https://github.com/rust-lang/rust-clippy/blob/a507c27660d05f37307369d30bee9e82ce3a11e1/clippy_lints/Cargo.toml#L4
to 0.1.52, the test should pass again.

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
Caused by:
  failed to open: /checkout/Cargo.lock

Caused by:
  Read-only file system (os error 30)
Build completed unsuccessfully in 0:00:49

@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never

Thanks. I've opened rust-lang/rust-clippy#6683 to track discontinuing this requirement upstream.

@bors
Copy link
Contributor

bors commented Feb 5, 2021

📌 Commit 83c34ea has been approved by Mark-Simulacrum

@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 5, 2021
@bors
Copy link
Contributor

bors commented Feb 6, 2021

⌛ Testing commit 83c34ea with merge 399b645...

@bors
Copy link
Contributor

bors commented Feb 6, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 399b645 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 6, 2021
@bors bors merged commit 399b645 into rust-lang:master Feb 6, 2021
@rustbot rustbot added this to the 1.52.0 milestone Feb 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

7 participants