Skip to content

Update doctest xcompile flags #15455

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Apr 26, 2025
Merged

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 25, 2025

This updates the flags used for doctest xcompile to match the upstream changes in rust-lang/rust#137096 which renamed and stabilized the flags.

This cannot be merged until after nightly is published tonight.

@rustbot
Copy link
Collaborator

rustbot commented Apr 25, 2025

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-documenting-cargo-itself Area: Cargo's documentation Command-test S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2025
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

Feel free to merge when it is no longer blocked

@weihanglo weihanglo enabled auto-merge April 26, 2025 00:30
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Stabilizes the --enable-per-target-ignores flag by removing it and making it unconditionally enabled. This makes it possible to disable a doctest on a per-target basis, which I think will be helpful for rolling out this feature.

Since per-target-ignore is enabled unconditionally, this test needs an adjustment.

fn cargo_test_doctest_xcompile_ignores() {

This updates the flags used for doctest xcompile to match the upstream
changes in rust-lang/rust#137096 which renamed
and stabilized the flags.
@ehuss ehuss force-pushed the doctest-xcompile-flags branch from ad333ec to f10630f Compare April 26, 2025 13:07
@weihanglo weihanglo added this pull request to the merge queue Apr 26, 2025
Merged via the queue into rust-lang:master with commit ee85ada Apr 26, 2025
23 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2025
Update cargo

10 commits in d811228b14ae2707323f37346aee3f4147e247e6..7918c7eb59614c39f1c4e27e99d557720976bdd7
2025-04-15 15:18:42 +0000 to 2025-04-27 09:44:23 +0000
- overriding-dependencies.md: better readability (rust-lang/cargo#15459)
- source-replacement.md: fix typo (rust-lang/cargo#15458)
- Stabilize automatic garbage collection. (rust-lang/cargo#14287)
- Update doctest xcompile flags (rust-lang/cargo#15455)
- fix: Suggest similar looking feature names when feature is missing (rust-lang/cargo#15454)
- fix(unit-graph): switch to Package ID Spec (rust-lang/cargo#15447)
- chore(deps): update cargo-semver-checks to v0.41.0 (rust-lang/cargo#15446)
- Implement RFC3695: Allow boolean literals as cfg predicates (rust-lang/cargo#14649)
- chore: remove duplicate word in comment (rust-lang/cargo#15437)
- Fix formatting of CliUnstable parsing (rust-lang/cargo#15434)

r? ghost
@rustbot rustbot added this to the 1.88.0 milestone Apr 28, 2025
weihanglo added a commit to weihanglo/cargo that referenced this pull request May 6, 2025
The doctest-xcompile flags have changed,
though we don't want to bother beta toolchain for that.

See rust-lang#15455
weihanglo added a commit to weihanglo/cargo that referenced this pull request May 6, 2025
The doctest-xcompile flags have changed,
though we don't want to bother beta toolchain for that.

See rust-lang#15455
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-documenting-cargo-itself Area: Cargo's documentation Command-test S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants