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/rustdoc-error-lines to new rmake.rs #124753

Merged
merged 5 commits into from
May 6, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented May 5, 2024

Part of #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 #124711. Some weird things happened recently pparently. ^^'

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

rustbot commented May 5, 2024

The run-make-support library was changed

cc @jieyouxu

Some changes occurred in run-make tests.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-determinism branch 2 times, most recently from dd53da9 to 458bfb4 Compare May 5, 2024 15:16
@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-determinism branch from 458bfb4 to bb474aa Compare May 5, 2024 15:24
@GuillaumeGomez
Copy link
Member Author

CI passed this time. :)

@jieyouxu
Copy link
Member

jieyouxu commented May 5, 2024

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 5, 2024

📌 Commit bb474aa 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 5, 2024
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`
bors added a commit to rust-lang-ci/rust that referenced this pull request May 6, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#124742 (Add `rustfmt` cfg to well known cfgs list)
 - rust-lang#124747 (Support Result<T, E> across FFI when niche optimization can be used (v2))
 - rust-lang#124753 (Migrate `run-make/rustdoc-error-lines` to new `rmake.rs`)
 - rust-lang#124765 ([rustdoc] Fix bad color for setting cog in ayu theme)
 - rust-lang#124768 ([resubmission] Meta: Enable the brand new triagebot transfer command)

r? `@ghost`
`@rustbot` modify labels: rollup
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``
@matthiaskrgr
Copy link
Member

@bors r- #124776

@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 6, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-determinism branch from bb474aa to 34fe217 Compare May 6, 2024 07:16
@GuillaumeGomez
Copy link
Member Author

Thanks for the notification, fixed it.

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 6, 2024

📌 Commit 34fe217 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 6, 2024
@bors
Copy link
Contributor

bors commented May 6, 2024

⌛ Testing commit 34fe217 with merge 25e3949...

@bors
Copy link
Contributor

bors commented May 6, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing 25e3949 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 6, 2024
@bors bors merged commit 25e3949 into rust-lang:master May 6, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 6, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-rustdoc-determinism branch May 6, 2024 16:19
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (25e3949): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.0% [2.0%, 2.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 676.654s -> 676.836s (0.03%)
Artifact size: 315.91 MiB -> 315.81 MiB (-0.03%)

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.

7 participants