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

remove cfg(bootstrap) from Miri #102838

Merged
merged 1 commit into from
Oct 9, 2022
Merged

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Oct 9, 2022

Looks like this was forgotten in the bootstrap bump.

r? @oli-obk

@rustbot
Copy link
Collaborator

rustbot commented Oct 9, 2022

The Miri subtree was changed

cc @rust-lang/miri

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 9, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Oct 9, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Oct 9, 2022

📌 Commit d47d390 has been approved by oli-obk

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 9, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2022
Rollup of 8 pull requests

Successful merges:

 - rust-lang#101118 (fs::get_mode enable getting the data via fcntl/F_GETFL on major BSD)
 - rust-lang#102072 (Add `ptr::Alignment` type)
 - rust-lang#102799 (rustdoc: remove hover gap in file picker)
 - rust-lang#102820 (Show let-else suggestion on stable.)
 - rust-lang#102829 (rename `ImplItemKind::TyAlias` to `ImplItemKind::Type`)
 - rust-lang#102831 (Don't use unnormalized type in `Ty::fn_sig` call in rustdoc `clean_middle_ty`)
 - rust-lang#102834 (Remove unnecessary `lift`/`lift_to_tcx` calls from rustdoc)
 - rust-lang#102838 (remove cfg(bootstrap) from Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f59e8af into rust-lang:master Oct 9, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 9, 2022
@RalfJung RalfJung deleted the miri-bootstrap branch October 10, 2022 18:09
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
remove cfg(bootstrap) from Miri

Looks like this was forgotten in the bootstrap bump.

r? `@oli-obk`
Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
Rollup of 8 pull requests

Successful merges:

 - rust-lang#101118 (fs::get_mode enable getting the data via fcntl/F_GETFL on major BSD)
 - rust-lang#102072 (Add `ptr::Alignment` type)
 - rust-lang#102799 (rustdoc: remove hover gap in file picker)
 - rust-lang#102820 (Show let-else suggestion on stable.)
 - rust-lang#102829 (rename `ImplItemKind::TyAlias` to `ImplItemKind::Type`)
 - rust-lang#102831 (Don't use unnormalized type in `Ty::fn_sig` call in rustdoc `clean_middle_ty`)
 - rust-lang#102834 (Remove unnecessary `lift`/`lift_to_tcx` calls from rustdoc)
 - rust-lang#102838 (remove cfg(bootstrap) from Miri)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

5 participants