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.

Sign up for GitHub

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

Jump to bottom

Migrate run-make/rustdoc-with-out-dir-option to new rmake.rs #125178

Merged
merged 3 commits into from
May 17, 2024
Merged

Migrate run-make/rustdoc-with-out-dir-option to new rmake.rs #125178

merged 3 commits into from
May 17, 2024

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

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

rustbot commented May 16, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

jieyouxu
jieyouxu reviewed May 16, 2024
View reviewed changes
tests/run-make/rustdoc-with-out-dir-option/rmake.rs Outdated
fn main() {
let out_dir = tmp_dir().join("rustdoc");
rustdoc().input("src/lib.rs").crate_name("foobar").crate_type("lib").output(&out_dir).run();
htmldocck().arg(out_dir).arg("src/lib.rs").status().unwrap().success();
Copy link
Member

Choose a reason for hiding this comment

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

I think this needs to be an assert?

Copy link
Member Author

Choose a reason for hiding this comment

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

It definitely does!

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-rustdoc-with-out-dir branch from 1095e61 to d594c9c Compare May 16, 2024 22:47
@GuillaumeGomez
Copy link
Member Author

I checked just in case and found two other cases where I forgot to add the assert!. Fixed them as well.

@rustbot
Copy link
Collaborator

rustbot commented May 16, 2024

The run-make-support library was changed

cc @jieyouxu

@GuillaumeGomez
Copy link
Member Author

And that allowed me to see that the htmldocck function was wrong too... Well, that was a productive late evening.

@jieyouxu
Copy link
Member

Thanks for fixing those! r=me after CI is green

@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented May 17, 2024

📌 Commit 61d4f5c 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 17, 2024
@bors
Copy link
Contributor

bors commented May 17, 2024

⌛ Testing commit 61d4f5c with merge a5c37ee...

@GuillaumeGomez GuillaumeGomez mentioned this pull request May 17, 2024
Merged
@bors
Copy link
Contributor

bors commented May 17, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 17, 2024
@bors bors merged commit a5c37ee into rust-lang:master May 17, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 17, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-rustdoc-with-out-dir branch May 17, 2024 11:34
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a5c37ee): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results (primary -0.4%)

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)		 - - 0
Improvements ✅
(primary)		 -0.4% [-0.4%, -0.4%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.4% [-0.4%, -0.4%] 1

Cycles

Results (primary -1.7%, secondary 1.9%)

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)		 2.4% [2.4%, 2.4%] 1
Regressions ❌
(secondary)		 2.7% [2.0%, 3.6%] 11
Improvements ✅
(primary)		 -3.1% [-5.2%, -2.0%] 3
Improvements ✅
(secondary)		 -2.5% [-2.7%, -2.2%] 2
All ❌✅ (primary) -1.7% [-5.2%, 2.4%] 4

Binary size

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

Bootstrap: 670.875s -> 669.422s (-0.22%)
Artifact size: 315.99 MiB -> 316.04 MiB (0.02%)

@jieyouxu jieyouxu mentioned this pull request May 20, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@jieyouxu jieyouxu

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
Oxidizing run-make tests
Status: Done
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
5 participants
@GuillaumeGomez @rustbot @jieyouxu @bors @rust-timer