-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Migrate run-make/doctests-runtool
to rmake
#124711
Conversation
Thanks! @bors r+ rollup |
@bors r- Actually one nit |
/// Specify the edition year. | ||
pub fn edition(&mut self, edition: &str) -> &mut Self { | ||
self.cmd.arg("--edition"); | ||
self.cmd.arg(edition); | ||
self | ||
} |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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!
Feel free to r=me after making the change and CI is green. |
4328880
to
a64ba04
Compare
@bors r=jieyouxu rollup |
…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`
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
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
☀️ Test successful - checks-actions |
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 |
Doing that when I arrive at the hotel. |
Are you sure this is the one? Seems like the failure is:
Did I miss something? |
Ah ok I see, it's part of #124753 apparently. Let's see there if something is missing. |
…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`
…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``
…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`
…=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`
…=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`
Part of #121876.
The first commit is making the
edition
method common toRustc
andRustdoc
as I'll need it for the doctest in #123974.r? @jieyouxu