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

Migrate run-make/doctests-runtool to rmake #124711

Merged
merged 2 commits into from
May 5, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

The first commit is making the edition method common to Rustc and Rustdoc as I'll need it for the doctest in #123974.

r? @jieyouxu

@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 May 4, 2024
@rustbot
Copy link
Collaborator

rustbot commented May 4, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

The run-make-support library was changed

cc @jieyouxu

@jieyouxu
Copy link
Member

jieyouxu commented May 4, 2024

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 4, 2024

📌 Commit 4328880 has been approved by jieyouxu

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 May 4, 2024
@jieyouxu
Copy link
Member

jieyouxu commented May 4, 2024

@bors r-

Actually one nit

@bors bors 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 May 4, 2024
Comment on lines 271 to 276
/// Specify the edition year.
pub fn edition(&mut self, edition: &str) -> &mut Self {
self.cmd.arg("--edition");
self.cmd.arg(edition);
self
}
Copy link
Member

Choose a reason for hiding this comment

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

This shouldn't be on impl_common_headers because that macro is designed to be usable for arbitrary command wrappers, so this should probably be on Rustc and Rustdoc. Some code duplication there is okay imo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh I see. Sounds good to me!

@jieyouxu
Copy link
Member

jieyouxu commented May 4, 2024

Feel free to r=me after making the change and CI is green.

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 4, 2024

📌 Commit a64ba04 has been approved by jieyouxu

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2024
fmease added a commit to fmease/rust that referenced this pull request May 5, 2024
…ntool, r=jieyouxu

Migrate `run-make/doctests-runtool` to rmake

Part of rust-lang#121876.

The first commit is making the `edition` method common to `Rustc` and `Rustdoc` as I'll need it for the doctest in rust-lang#123974.

r? `@jieyouxu`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#122253 (Support Result<T, E> across FFI when niche optimization can be used)
 - rust-lang#123892 (Document That `f16` And `f128` Hardware Support is Limited)
 - rust-lang#124458 (Implement lldb formattter for "clang encoded" enums (LLDB 18.1+))
 - rust-lang#124459 (Stabilize exclusive_range_pattern)
 - rust-lang#124711 (Migrate `run-make/doctests-runtool` to rmake)
 - rust-lang#124725 (Meta: Enable the brand new triagebot transfer command)
 - rust-lang#124727 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#122253 (Support Result<T, E> across FFI when niche optimization can be used)
 - rust-lang#123892 (Document That `f16` And `f128` Hardware Support is Limited)
 - rust-lang#124458 (Implement lldb formattter for "clang encoded" enums (LLDB 18.1+))
 - rust-lang#124459 (Stabilize exclusive_range_pattern)
 - rust-lang#124711 (Migrate `run-make/doctests-runtool` to rmake)
 - rust-lang#124725 (Meta: Enable the brand new triagebot transfer command)
 - rust-lang#124727 (Miri subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented May 5, 2024

⌛ Testing commit a64ba04 with merge 2e0982d...

@bors
Copy link
Contributor

bors commented May 5, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 2e0982d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2024
@bors bors merged commit 2e0982d into rust-lang:master May 5, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 5, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-doctests-runtool branch May 5, 2024 09:22
@Kobzol
Copy link
Contributor

Kobzol commented May 5, 2024

This PR has been merged by accident, without the full test suite being run. It was my fault (#124631 got merged and it broke our CI). @GuillaumeGomez Could you please create a new PR with your branch against the latest version of origin/master? Thank you, and sorry for the mess.

@GuillaumeGomez
Copy link
Member Author

Doing that when I arrive at the hotel.

@GuillaumeGomez
Copy link
Member Author

GuillaumeGomez commented May 5, 2024

Are you sure this is the one? Seems like the failure is:

failures:
    [ui] tests/ui/self/self-in-mut-slot-default-method.rs

Did I miss something?

@GuillaumeGomez
Copy link
Member Author

Ah ok I see, it's part of #124753 apparently. Let's see there if something is missing.

fmease added a commit to fmease/rust that referenced this pull request May 5, 2024
…erminism, r=jieyouxu

Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`

Part of rust-lang#121876.

There was a weird naming inconsistency with `input`/`output`. A few tests write `.arg("-o").arg(path)` and the `output` method was actually the command output. So instead, I renamed the original `output` into `command_output` so that I could create the `output` method with the expected effect (and updated the tests to use it too).

EDIT: The first two commits come from rust-lang#124711. Some weird things happened recently pparently. ^^'

r? `@jieyouxu`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 6, 2024
…erminism, r=jieyouxu

Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`

Part of rust-lang#121876.

There was a weird naming inconsistency with `input`/`output`. A few tests write `.arg("-o").arg(path)` and the `output` method was actually the command output. So instead, I renamed the original `output` into `command_output` so that I could create the `output` method with the expected effect (and updated the tests to use it too).

EDIT: The first two commits come from rust-lang#124711. Some weird things happened recently pparently. ^^'

r? ``@jieyouxu``
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2024
…minism, r=jieyouxu

Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`

Part of rust-lang#121876.

There was a weird naming inconsistency with `input`/`output`. A few tests write `.arg("-o").arg(path)` and the `output` method was actually the command output. So instead, I renamed the original `output` into `command_output` so that I could create the `output` method with the expected effect (and updated the tests to use it too).

EDIT: The first two commits come from rust-lang#124711. Some weird things happened recently pparently. ^^'

r? `@jieyouxu`
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request May 11, 2024
…=jieyouxu

Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`

Part of rust-lang/rust#121876.

There was a weird naming inconsistency with `input`/`output`. A few tests write `.arg("-o").arg(path)` and the `output` method was actually the command output. So instead, I renamed the original `output` into `command_output` so that I could create the `output` method with the expected effect (and updated the tests to use it too).

EDIT: The first two commits come from rust-lang/rust#124711. Some weird things happened recently pparently. ^^'

r? `@jieyouxu`
flip1995 pushed a commit to flip1995/rust-clippy that referenced this pull request May 24, 2024
…=jieyouxu

Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`

Part of rust-lang/rust#121876.

There was a weird naming inconsistency with `input`/`output`. A few tests write `.arg("-o").arg(path)` and the `output` method was actually the command output. So instead, I renamed the original `output` into `command_output` so that I could create the `output` method with the expected effect (and updated the tests to use it too).

EDIT: The first two commits come from rust-lang/rust#124711. Some weird things happened recently pparently. ^^'

r? `@jieyouxu`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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)
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

5 participants