Fix rustdoc --test-builder argument parsing by teryror · Pull Request #80924 · rust-lang/rust

teryror · 2021-01-11T19:43:06Z

My suggested fix to issue #80893. I can actually hook Miri in there now.

I also fixed what I believe to be a typo in the option's help text.

rust-highfive · 2021-01-11T19:43:09Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @jyn514 (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

jyn514 · 2021-01-12T03:30:45Z

Can you add a test for the fixed behavior so this doesn't regress again? It would go in src/test/rustdoc, see https://rustc-dev-guide.rust-lang.org/rustdoc-internals.html#dotting-is-and-crossing-ts for instructions. I'm not sure what to use as the test builder - maybe true or false or something?

teryror · 2021-01-12T16:33:42Z

There you go. I hope I did that right, I don't rebase very often.

jyn514 · 2021-01-12T16:47:49Z

@teryror I think you forgot to add the regression test to git.

Co-authored-by: Joshua Nelson <joshua@yottadb.com>

jyn514 · 2021-01-12T17:19:59Z

r=me with CI passing (feel free to ping me if I forget). Thanks for fixing this!

jyn514 · 2021-01-12T18:06:15Z

@bors r+

bors · 2021-01-12T18:06:16Z

📌 Commit f3c8f29 has been approved by jyn514

teryror · 2021-01-12T18:08:44Z

Hooray!

Glad to be of service. Also, sorry about the brain farts earlier :D

jyn514 · 2021-01-12T18:15:06Z

No problem! That's what review is for anyway :)

Rollup of 10 pull requests Successful merges: - rust-lang#78901 (diagnostics: Note capturing closures can't be coerced to fns) - rust-lang#79588 (Provide more information for HRTB lifetime errors involving closures) - rust-lang#80232 (Remove redundant def_id lookups) - rust-lang#80662 (Added support for i386-unknown-linux-gnu and i486-unknown-linux-gnu) - rust-lang#80736 (use Once instead of Mutex to manage capture resolution) - rust-lang#80796 (Update to LLVM 11.0.1) - rust-lang#80859 (Fix --pretty=expanded with --remap-path-prefix) - rust-lang#80922 (Revert "Auto merge of rust-lang#76896 - spastorino:codegen-inline-fns2) - rust-lang#80924 (Fix rustdoc --test-builder argument parsing) - rust-lang#80935 (Rename `rustc_middle::lint::LevelSource` to `LevelAndSource`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

tmiasko · 2021-01-19T16:52:16Z

@@ -0,0 +1,6 @@
+// compile-flags: --test -Z unstable-options --test-builder true


rustdoc passes the source code the the builder through stdin. If true happens to terminate before that, the rustdoc will be terminated by SIGPIPE. This makes the test quite flaky, e.g., #79705 (comment)

Could we use cat instead ?

Or maybe wc if the output would end up in the test log.

cat: unrecognized option '--crate-type'

Hmm, in shell : will work, but I think this goes through process::Command.

You can always just use --test-builder rustc.

Hmm, in shell : will work, but I think this goes through process::Command.
No, :, if it works, is just an alias for true. It would have the same problem. We need something that will actually read the input.
You can always just use --test-builder rustc.
Haha lol, why didn't I think of that. Of course that wouldn't test that the argument actually has any effect but the current test doesn't check that anyway. So +1.

I opened #81197 fixing this.

rust-highfive assigned jyn514 Jan 11, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 11, 2021

jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jan 12, 2021

jyn514 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-review Status: Awaiting review from the assignee but also interested parties. labels Jan 12, 2021

jyn514 reviewed Jan 12, 2021
View reviewed changes

Comment threadsrc/librustdoc/lib.rs Outdated

Fix rustdoc --test-builder argument parsing
b18a426

teryror force-pushed the issue-80893-fix branch from 3973140 to 8180a10Compare January 12, 2021 16:32

Update help message and add regression test
0401a99

teryror force-pushed the issue-80893-fix branch from 8180a10 to 0401a99Compare January 12, 2021 17:00

jyn514 reviewed Jan 12, 2021
View reviewed changes

Comment threadsrc/test/rustdoc/issue-80893.rs Outdated

Simplify regression test
f3c8f29
Co-authored-by: Joshua Nelson <joshua@yottadb.com>

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 Jan 12, 2021

Dylan-DPC-zz mentioned this pull request Jan 13, 2021
Rollup of 10 pull requests #80960
Merged

bors merged commit c64d3f0 into rust-lang:masterJan 13, 2021

rustbot added this to the 1.51.0 milestone Jan 13, 2021

teryror deleted the issue-80893-fix branch January 13, 2021 08:08

This was referenced Jan 13, 2021
rustdoc: unstable --test-builder option is parsed incorrectly ("too many file operands") #80893
Closed
Make cargo-miri run documentation tests rust-lang/miri#1671
Closed

tmiasko reviewed Jan 19, 2021
View reviewed changes

jyn514 mentioned this pull request Jan 19, 2021
Fix flaky test #81197
Closed

		@@ -0,0 +1,6 @@
		// compile-flags: --test -Z unstable-options --test-builder true

Uh oh!

Uh oh!

Conversation

teryror commented Jan 11, 2021

Uh oh!

rust-highfive commented Jan 11, 2021

Uh oh!

jyn514 commented Jan 12, 2021

Uh oh!

Uh oh!

teryror commented Jan 12, 2021

Uh oh!

jyn514 commented Jan 12, 2021

Uh oh!

Uh oh!

jyn514 commented Jan 12, 2021

Uh oh!

jyn514 commented Jan 12, 2021

Uh oh!

bors commented Jan 12, 2021

Uh oh!

teryror commented Jan 12, 2021

Uh oh!

jyn514 commented Jan 12, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants