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

[beta] Backports #93306

Merged
merged 4 commits into from
Jan 26, 2022
Merged

[beta] Backports #93306

merged 4 commits into from
Jan 26, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jan 25, 2022

ehuss and others added 4 commits January 25, 2022 12:03
@ehuss
[beta] Update cargo
14b8f9a
@matthiaskrgr @ehuss
Rollup merge of rust-lang#93128 - pietroalbini:pa-verify-stable-versi…
9f7c5dc 
…on-number, r=Mark-Simulacrum

Add script to prevent point releases with same number as existing ones

This will hopefully prevent what happened today with rust-lang#93110 and rust-lang#93121, where we built point release artifacts without changing version numbers, thus requiring another PR to change the version number.

r? `@Mark-Simulacrum`
@bors @ehuss
Auto merge of rust-lang#93014 - Kobzol:revert-92103-stable-hash-skip-…
e5e539c 
…zero-bytes, r=the8472

Revert "Do not hash leading zero bytes of i64 numbers in Sip128 hasher"

Reverts rust-lang#92103. It had a (in retrospect, obvious) correctness problem where changing the order of two adjacent values would produce identical hashes, which is problematic in stable hashing (see [this comment](rust-lang#92103 (comment))).

I'll try to send the PR again with a fix for this issue.

r? `@the8472`
@matthiaskrgr @ehuss
Rollup merge of rust-lang#93012 - GuillaumeGomez:pulldown-list, r=cam…
c678458 
…elid

Update pulldown-cmark version to fix markdown list issue

Fixes rust-lang#92971.

r? ```@camelid```
@ehuss ehuss self-assigned this Jan 25, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jan 25, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 25, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Jan 25, 2022

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Jan 25, 2022

📌 Commit c678458 has been approved by ehuss

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

bors commented Jan 26, 2022

⌛ Testing commit c678458 with merge d5719ffeff8657f84602c24291d2e26ffa51170e...

@bors
Copy link
Contributor

bors commented Jan 26, 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 Jan 26, 2022
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@ehuss
Copy link
Contributor Author

ehuss commented Jan 26, 2022

@bors retry

"Package python3-setuptools is not available"

I, uh, don't know why that would happen. Retrying to see if it was just a random network error or something.

@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 Jan 26, 2022
@bors
Copy link
Contributor

bors commented Jan 26, 2022

⌛ Testing commit c678458 with merge e96a6c524196e7636a63b0cdcad135f1058dd996...

@bors
Copy link
Contributor

bors commented Jan 26, 2022

💥 Test timed out

@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 Jan 26, 2022
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

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

@matthiaskrgr
Copy link
Member

@bors retry x86_64-msvc-1 timeout during rustc_macros compilation

@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 Jan 26, 2022
@matthiaskrgr
Copy link
Member

cc #93329

@bors
Copy link
Contributor

bors commented Jan 26, 2022

⌛ Testing commit c678458 with merge 436b81f...

@bors
Copy link
Contributor

bors commented Jan 26, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 436b81f to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2022
@bors bors merged commit 436b81f into rust-lang:beta Jan 26, 2022
@rustbot rustbot added this to the 1.59.0 milestone Jan 26, 2022
@ehuss ehuss mentioned this pull request Jan 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

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.
Projects
None yet
Milestone
1.59.0
Development

Successfully merging this pull request may close these issues.
6 participants
@ehuss @rust-highfive @bors @rust-log-analyzer @matthiaskrgr @rustbot