Skip to content

[beta] Backports - #93306

Merged
bors merged 4 commits into
rust-lang:betafrom
ehuss:beta-backports
Jan 26, 2022
Merged

[beta] Backports#93306
bors merged 4 commits into
rust-lang:betafrom
ehuss:beta-backports

Conversation

@ehuss

Copy link
Copy Markdown
Contributor

ehussand others added 4 commits January 25, 2022 12:03
…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`
…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`
…elid
Update pulldown-cmark version to fix markdown list issue
Fixesrust-lang#92971.
r? ```@camelid```
@ehussehuss self-assigned this Jan 25, 2022
@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️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.

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

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=1 rollup=never

@bors

bors commented Jan 25, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit c678458 has been approved by ehuss

@borsbors 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

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c678458 with merge d5719ffeff8657f84602c24291d2e26ffa51170e...

@bors

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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
Copy Markdown
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
Copy Markdown
ContributorAuthor

@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.

@borsbors 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

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c678458 with merge e96a6c524196e7636a63b0cdcad135f1058dd996...

@bors

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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
Copy Markdown
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
Copy Markdown
Member

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

@borsbors 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
Copy Markdown
Member

cc #93329

@bors

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c678458 with merge 436b81f...

@bors

bors commented Jan 26, 2022

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2022
@bors
bors merged commit 436b81f into rust-lang:betaJan 26, 2022
@rustbotrustbot added this to the 1.59.0 milestone Jan 26, 2022
@ehussehuss mentioned this pull request Jan 26, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@ehuss@rust-highfive@bors@rust-log-analyzer@matthiaskrgr@rustbot