Skip to content

[Priroda] Add bootstrap test and check steps - #160629

Merged
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
moabo3li:priroda-bootstrap-ci
Aug 11, 2026
Merged

[Priroda] Add bootstrap test and check steps#160629
rust-bors[bot] merged 2 commits into
rust-lang:mainfrom
moabo3li:priroda-bootstrap-ci

Conversation

@moabo3li

@moabo3li moabo3li commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

View all comments

The priroda crate lives under src/tools/miri/priroda and shares miri's sysroot and toolchain setup, so register a test step that mirrors the existing miri one and a check step alongside cargo-miri.

r? oli-obk

@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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Aug 6, 2026
@rust-log-analyzer

This comment has been minimized.

@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from 678ced9 to cfef2d4 Compare August 6, 2026 11:02
@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from cfef2d4 to baf696d Compare August 6, 2026 11:13
@rustbot

rustbot commented Aug 6, 2026

Copy link
Copy Markdown
Collaborator

miri is developed in its own repository. If the Miri part of this change can be broken out, consider making this change to rust-lang/miri instead. However, if Miri needs adjusting for rustc changes, just ignore this message.

cc @rust-lang/miri

@oli-obk

oli-obk commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Does the [workspace] change affect building priroda (or miri) inside the miri repo?

@moabo3li

moabo3li commented Aug 6, 2026

Copy link
Copy Markdown
Contributor Author

Does the [workspace] change affect building priroda (or miri) inside the miri repo?

No, it doesn't break it.

@oli-obk

oli-obk commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@bors r+ rollup=iffy

@rust-bors

rust-bors Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

📌 Commit baf696d has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 6, 2026
@moabo3li

moabo3li commented Aug 6, 2026

Copy link
Copy Markdown
Contributor Author

I think it failed because the last PR hasn’t landed yet.

@rust-log-analyzer

This comment has been minimized.

Comment thread src/bootstrap/src/core/build_steps/test.rs
Comment thread src/bootstrap/src/core/build_steps/test.rs Outdated
@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from baf696d to 2a9baea Compare August 6, 2026 12:03
@rustbot

rustbot commented Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Warning

If you are changing how CI LLVM is built or linked, make sure to bump
src/bootstrap/download-ci-llvm-stamp.

cc @jieyouxu

@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 6, 2026
@rust-bors

rust-bors Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit 2a9baea5bc1794c5edc9dc1d8bd55127d37bcd07 was pushed.

This pull request was unapproved.

@rustbot rustbot added A-CI Area: Our Github Actions CI T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Aug 6, 2026
@rust-log-analyzer

This comment has been minimized.

@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from 2a9baea to cb36e40 Compare August 6, 2026 12:15
@rust-log-analyzer

This comment has been minimized.

@Kobzol Kobzol left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@RalfJung

RalfJung commented Aug 6, 2026

Copy link
Copy Markdown
Member

The build here apparently runs with deny(warnings). Does Miri's CI for Priroda also have deny(warnings)?

Also, once this lands, please remember to add Priroda to the bootstrap build in Miri's CI to ensure it builds with the bootstrap compiler (and not just with the nightly compiler).

I think it failed because the last PR hasn’t landed yet.

I made a sync PR: #160634

@RalfJung

RalfJung commented Aug 6, 2026

Copy link
Copy Markdown
Member

In particular, this one here...

  warning: hidden lifetime parameters in types are deprecated
      --> src/tools/miri/priroda/src/main.rs:1029:40
       |
  1029 |     fn print_location(&self, session: &PrirodaContext) {
       |                                        ^^^^^^^^^^^^^^ expected lifetime parameter
       |
       = note: `-W elided-lifetimes-in-paths` implied by `-W rust-2018-idioms`
       = help: to override `-W rust-2018-idioms` add `#[allow(elided_lifetimes_in_paths)]`

probably currently does not get caught? I assume bootstrap is adding -W rust-2018-idioms ? Miri's own CI doesn't so we are risking mismatches. Miri itself has the following:

#![warn(
    rust_2018_idioms,
    unqualified_local_imports,
)]

Probably would be good to also add that to Priroda. (Can also be done in a cargo section these days if you prefer that.)

@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from cb36e40 to 58b5196 Compare August 8, 2026 20:22
@rustbot

rustbot commented Aug 8, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch 2 times, most recently from decbc23 to 7670508 Compare August 8, 2026 20:23
@moabo3li

moabo3li commented Aug 8, 2026

Copy link
Copy Markdown
Contributor Author

In particular, this one here...

  warning: hidden lifetime parameters in types are deprecated
      --> src/tools/miri/priroda/src/main.rs:1029:40
       |
  1029 |     fn print_location(&self, session: &PrirodaContext) {
       |                                        ^^^^^^^^^^^^^^ expected lifetime parameter
       |
       = note: `-W elided-lifetimes-in-paths` implied by `-W rust-2018-idioms`
       = help: to override `-W rust-2018-idioms` add `#[allow(elided_lifetimes_in_paths)]`

probably currently does not get caught? I assume bootstrap is adding -W rust-2018-idioms ? Miri's own CI doesn't so we are risking mismatches. Miri itself has the following:

#![warn(
    rust_2018_idioms,
    unqualified_local_imports,
)]

Probably would be good to also add that to Priroda. (Can also be done in a cargo section these days if you prefer that.)

Thanks for the heads-up!

yep, added the lints and bootstrap check, should be covered now.

Comment thread src/tools/miri/.github/workflows/ci.yml Outdated
Comment on lines +159 to +160
./x check miri
./x check src/tools/miri/priroda

@RalfJung RalfJung Aug 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
./x check miri
./x check src/tools/miri/priroda
# checks every tool in that folder (including priroda)
./x check src/tools/miri

View changes since the review

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

- Add rust_2018_idioms warn in Cargo.toml to catch elided lifetimes
  and other 2018-idiom lints, matching Miri crate-level lint policy.
- Add ./x check src/tools/miri/priroda to bootstrap CI step.
- Add cargo clippy --all-targets --locked -- -D warnings step to
  priroda CI job.
@moabo3li
moabo3li force-pushed the priroda-bootstrap-ci branch from 7670508 to e2a6442 Compare August 8, 2026 20:50
@moabo3li
moabo3li requested a review from oli-obk August 10, 2026 05:45
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 10, 2026

@oli-obk oli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rust-bors

rust-bors Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

📌 Commit e2a6442 has been approved by oli-obk

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Aug 10, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 11, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - #160629 ([Priroda] Add bootstrap test and check steps)
 - #160811 (Fix `visible_parent_map` fallback map merging perf regression)
 - #154329 (Diagnostics ICE when replaying proof trees with next-solver)
 - #157841 (Ensure inferred let pattern types are well-formed)
 - #159300 (Implement `to_string()` on `ByteStr` and `ByteString`)
 - #160858 (Add regression test for assoc const panic ICE in match)
 - #160864 (Rename `HostEffectPredicate` to `HostEffectClause`)
@rust-bors
rust-bors Bot merged commit e84bdbd into rust-lang:main Aug 11, 2026
13 checks passed
rust-timer added a commit that referenced this pull request Aug 11, 2026
Rollup merge of #160629 - moabo3li:priroda-bootstrap-ci, r=oli-obk

[Priroda] Add bootstrap test and check steps

The priroda crate lives under src/tools/miri/priroda and shares miri's sysroot and toolchain setup, so register a test step that mirrors the existing miri one and a check step alongside cargo-miri.

r? oli-obk
@rustbot rustbot added this to the 1.99.0 milestone Aug 11, 2026
github-actions Bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Aug 11, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#160629 ([Priroda] Add bootstrap test and check steps)
 - rust-lang/rust#160811 (Fix `visible_parent_map` fallback map merging perf regression)
 - rust-lang/rust#154329 (Diagnostics ICE when replaying proof trees with next-solver)
 - rust-lang/rust#157841 (Ensure inferred let pattern types are well-formed)
 - rust-lang/rust#159300 (Implement `to_string()` on `ByteStr` and `ByteString`)
 - rust-lang/rust#160858 (Add regression test for assoc const panic ICE in match)
 - rust-lang/rust#160864 (Rename `HostEffectPredicate` to `HostEffectClause`)
bjorn3 pushed a commit to bjorn3/stdarch that referenced this pull request Aug 13, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#160629 ([Priroda] Add bootstrap test and check steps)
 - rust-lang/rust#160811 (Fix `visible_parent_map` fallback map merging perf regression)
 - rust-lang/rust#154329 (Diagnostics ICE when replaying proof trees with next-solver)
 - rust-lang/rust#157841 (Ensure inferred let pattern types are well-formed)
 - rust-lang/rust#159300 (Implement `to_string()` on `ByteStr` and `ByteString`)
 - rust-lang/rust#160858 (Add regression test for assoc const panic ICE in match)
 - rust-lang/rust#160864 (Rename `HostEffectPredicate` to `HostEffectClause`)
pull Bot pushed a commit to LeeeeeeM/miri that referenced this pull request Aug 16, 2026
…uwer

Rollup of 7 pull requests

Successful merges:

 - rust-lang/rust#160629 ([Priroda] Add bootstrap test and check steps)
 - rust-lang/rust#160811 (Fix `visible_parent_map` fallback map merging perf regression)
 - rust-lang/rust#154329 (Diagnostics ICE when replaying proof trees with next-solver)
 - rust-lang/rust#157841 (Ensure inferred let pattern types are well-formed)
 - rust-lang/rust#159300 (Implement `to_string()` on `ByteStr` and `ByteString`)
 - rust-lang/rust#160858 (Add regression test for assoc const panic ICE in match)
 - rust-lang/rust#160864 (Rename `HostEffectPredicate` to `HostEffectClause`)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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