Skip to content

[beta] branch 1.66#103802

Merged
bors merged 5 commits intorust-lang:betafrom
Mark-Simulacrum:beta-next
Nov 1, 2022
Merged

[beta] branch 1.66#103802
bors merged 5 commits intorust-lang:betafrom
Mark-Simulacrum:beta-next

Conversation

@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Oct 31, 2022

This PR:

@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2022

r? @thomcc

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

@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2022

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

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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 Oct 31, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 31, 2022
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Oct 31, 2022

r? @Mark-Simulacrum

@bors r+ rollup=never p=4

@rustbot
Copy link
Collaborator

rustbot commented Oct 31, 2022

Could not determine reviewer from Mark-Simulacrum.

@bors
Copy link
Collaborator

bors commented Oct 31, 2022

📌 Commit e83be5d has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Oct 31, 2022
@bors
Copy link
Collaborator

bors commented Oct 31, 2022

⌛ Testing commit e83be5d with merge 1546bd6b7ea4c7ae2379fdf5abc02b33157a08c3...

@bors
Copy link
Collaborator

bors commented Oct 31, 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 Oct 31, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Adjust miri to still be optional
c2bb2e1 
We don't distribute a miri build for beta/stable so it needs to be kept
optional. In the future it likely makes sense to switch the miri
*artifacts* to always be built, but the rustup component to not be
included -- this will avoid some of this pain.
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Nov 1, 2022

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Nov 1, 2022

📌 Commit c2bb2e1 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Nov 1, 2022
@bors
Copy link
Collaborator

bors commented Nov 1, 2022

⌛ Testing commit c2bb2e1 with merge e080cc5...

@bors
Copy link
Collaborator

bors commented Nov 1, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing e080cc5 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 1, 2022
@bors bors merged commit e080cc5 into rust-lang:beta Nov 1, 2022
@rustbot rustbot added this to the 1.66.0 milestone Nov 1, 2022
@RalfJung
Copy link
Member

RalfJung commented Nov 1, 2022 

thread 'main' panicked at 'could not read dir "D:\\a\\rust\\rust\\build\\tmp\\tarball\\rust\\i686-pc-windows-msvc\\miri-beta-i686-pc-windows-msvc\\miri-preview": Os { code: 3, kind: NotFound, message: "The system cannot find the path specified." }', lib.rs:1578:25

@oli-obk any idea why it is even trying to build and package up Miri here? This is a beta branch build...
I guess on master this step must work since people get a Miri component on i686-msvc. Seems like on beta somehow we do skip the step of building Miri but we don't skip the step of creating a rustup component and of course that fails?

Btw, AFAIK on master we are not ever testing Miri on i686-msvc. Is the same true for Clippy? Is this building and shipping Clippy on a target that we haven't even tested it?

@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch November 1, 2022 12:19
@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Nov 1, 2022

c2bb2e1 is the commit which fixed the miri problems on beta. As the description there says my guess is we'll want to either forward-port (to master) that as-is or an alternative which starts building but not distributing miri on beta/stable.

@JohnTitor JohnTitor mentioned this pull request Nov 4, 2022
Merged
@lukas-code lukas-code mentioned this pull request Dec 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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.66.0

Development

Successfully merging this pull request may close these issues.

7 participants

@Mark-Simulacrum @rustbot @bors @rust-log-analyzer @RalfJung @thomcc @notriddle