Skip to content

Fix compat.rs for cfg(miri)#99984

Merged
bors merged 2 commits intorust-lang:masterfrom
ChrisDenton:fix-miri
Aug 1, 2022
Merged

Fix compat.rs for cfg(miri)#99984
bors merged 2 commits intorust-lang:masterfrom
ChrisDenton:fix-miri

Conversation

@ChrisDenton
Copy link
Member

@ChrisDenton ChrisDenton commented Jul 31, 2022

Fixes #99982

@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Jul 31, 2022
@rustbot
Copy link
Collaborator

rustbot commented Jul 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

@rust-highfive
Copy link
Contributor

rust-highfive commented Jul 31, 2022

@ChrisDenton: 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 Jul 31, 2022
@ChrisDenton
Copy link
Member Author

ChrisDenton commented Jul 31, 2022

r? libs

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 31, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 31, 2022

📌 Commit 15d90f564b0671d83db697e423ebe72c01eb47e4 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 Jul 31, 2022
RalfJung
RalfJung reviewed Jul 31, 2022
View reviewed changes
@RalfJung
Copy link
Member

RalfJung commented Jul 31, 2022

@bors rollup

@ChrisDenton
Copy link
Member Author

ChrisDenton commented Jul 31, 2022

Just uppercased statics and squished.

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Jul 31, 2022

📌 Commit bf0b18e has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@matthiaskrgr matthiaskrgr mentioned this pull request Jul 31, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2022
@bors
Auto merge of rust-lang#99998 - matthiaskrgr:rollup-igafy0r, r=matthi…
6423ab3 
…askrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#99519 (Remove implicit names and values from `--cfg` in `--check-cfg`)
 - rust-lang#99620 (`-Z location-detail`: provide option to disable all location details)
 - rust-lang#99932 (Fix unwinding on certain platforms when debug assertions are enabled)
 - rust-lang#99973 (Layout things)
 - rust-lang#99980 (Remove more Clean trait implementations)
 - rust-lang#99984 (Fix compat.rs for `cfg(miri)`)
 - rust-lang#99986 (Add wrap suggestions for record variants)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e4fcee5 into rust-lang:master Aug 1, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 1, 2022
@ChrisDenton ChrisDenton deleted the fix-miri branch August 1, 2022 04:10
@RalfJung RalfJung mentioned this pull request Aug 1, 2022
Merged
bors added a commit to rust-lang/miri that referenced this pull request Aug 1, 2022
@bors
Auto merge of #2453 - RalfJung:rustup, r=RalfJung
c593945 
rustup

Should work again, now that rust-lang/rust#99984 landed.
bors added a commit to rust-lang/miri that referenced this pull request Aug 1, 2022
@bors
Auto merge of #2453 - RalfJung:rustup, r=RalfJung
7865255 
rustup

Should work again, now that rust-lang/rust#99984 landed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RalfJung RalfJung RalfJung left review comments

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.64.0

Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#99553

6 participants

@ChrisDenton @rustbot @rust-highfive @Mark-Simulacrum @bors @RalfJung