Use `rust_out{exe_suffix}` for doctests#95836

workingjubilee · 2022-04-09T05:35:30Z

This was mentioned as an issue to me by @bruxisma. There are 3 separate instances where "rust_out" can become part of the name of a Rust executable, so I am mostly just hoping that this fixes the problem, given that the other sites which it can slip in seem to be well-behaved.

rust-highfive · 2022-04-09T05:35:33Z

r? @notriddle

(rust-highfive has picked a reviewer for you, use r? to override)

ChrisDenton · 2022-04-09T06:43:35Z

For maximum portability and future proofing you may want to use one of the consts in std::env::consts

workingjubilee · 2022-04-09T09:09:39Z

Oh nice, I didn't even know those existed. You learn something new every day etc.
Also a very good point since on e.g. wasi this should be .wasm, and so on.

notriddle · 2022-04-09T15:07:10Z

@bors r+

bors · 2022-04-09T15:07:11Z

📌 Commit d483220 has been approved by notriddle

…ddle Use rust_out{,.exe,.wasm} for doctests This was mentioned as an issue to me by `@bruxisma.` There are 3 separate instances where "rust_out" can become part of the name of a Rust executable, so I am mostly just hoping that this fixes the problem, given that the other sites which it can slip in seem to be well-behaved.

src/librustdoc/doctest.rs

notriddle · 2022-04-11T13:11:39Z

You’re right, of course. Cross-compiling matters.

@bors r-

workingjubilee · 2022-04-11T19:15:35Z

Honestly, I'm surprised we don't have a single unified interface for handling emitting binaries in the compiler that everyone is forced to go through. Or maybe I'm just missing something.

workingjubilee · 2022-04-12T10:00:57Z

I was going to investigate adding a relatively thorough test but having done more digging, persisting doctests and runtool are both unstable features, as are target spec jsons (the case this doesn't directly handle now), of course. I can investigate a further improvement in a later PR but this is already starting to get a bit afield of rustdoc's specialties and is in any case more correct than what was there before.

@rustbot label: -S-waiting-on-author +S-waiting-on-review

notriddle · 2022-04-22T18:52:46Z

@bors r+ rollup

bors · 2022-04-22T18:52:47Z

📌 Commit 7882cf7ff44e5faa8bda9e159d03116c7e092434 has been approved by notriddle

bors · 2022-04-23T18:31:00Z

⌛ Testing commit 7882cf7ff44e5faa8bda9e159d03116c7e092434 with merge 69aab9ae8baa2490718c54ae633f447beaaa16bf...

bors · 2022-04-23T19:31:59Z

💔 Test failed - checks-actions

jyn514 · 2022-11-27T02:05:12Z

  $( for file in /d/a/rust/rust/build/x86_64-pc-windows-msvc/test/run-make-fulldeps/coverage-reports/coverage-reports/rustdoc-abort/*/rust_out; do [ -x "$file" ] && printf "%s %s " -object $file; done ) \

this probably just needs to use rust_out* instead of rust_out.

workingjubilee · 2022-11-27T02:48:08Z

Oh, sorry! I had forgotten about this. ^^;

This will use rust_out.exe for doctests on Windows, rust_out.wasm for doctests in the wasm case, and also handles cross-compiling or user-provided targets.

workingjubilee · 2022-11-27T04:12:38Z

Okay. New version should handle every single case, including user-provided targets, smoothly.

notriddle · 2022-11-27T04:56:52Z

@bors r+ rollup

bors · 2022-11-27T04:56:54Z

📌 Commit 47ddca6 has been approved by notriddle

It is now in the queue for this repository.

…ddle Use `rust_out{exe_suffix}` for doctests This was mentioned as an issue to me by `@bruxisma.` There are 3 separate instances where "rust_out" can become part of the name of a Rust executable, so I am mostly just hoping that this fixes the problem, given that the other sites which it can slip in seem to be well-behaved.

…ddle Use `rust_out{exe_suffix}` for doctests This was mentioned as an issue to me by ``@bruxisma.`` There are 3 separate instances where "rust_out" can become part of the name of a Rust executable, so I am mostly just hoping that this fixes the problem, given that the other sites which it can slip in seem to be well-behaved.

…ddle Use `rust_out{exe_suffix}` for doctests This was mentioned as an issue to me by ```@bruxisma.``` There are 3 separate instances where "rust_out" can become part of the name of a Rust executable, so I am mostly just hoping that this fixes the problem, given that the other sites which it can slip in seem to be well-behaved.

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#95836 (Use `rust_out{exe_suffix}` for doctests) - rust-lang#104882 (notify lcnr on changes to `ObligationCtxt`) - rust-lang#104892 (Explain how to get the discriminant out of a `#[repr(T)] enum` with payload) - rust-lang#104917 (Allow non-org members to label `requires-debug-assertions`) - rust-lang#104931 (Pretty-print generators with their `generator_kind`) - rust-lang#104934 (Remove redundant `all` in cfg) - rust-lang#104944 (Support unit tests for jsondoclint) - rust-lang#104946 (rustdoc: improve popover focus handling JS) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

workingjubilee · 2022-11-27T20:37:10Z

Awesome! Thank you for reminding me about this!

rust-highfive assigned notriddle Apr 9, 2022

rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Apr 9, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 9, 2022

workingjubilee changed the title ~~Use rust_out.exe for doctests on Windows~~ Use rust_out{,.exe,.wasm} for doctests Apr 9, 2022

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 Apr 9, 2022

Dylan-DPC mentioned this pull request Apr 9, 2022

Rollup of 6 pull requests #95869

Closed

bjorn3 reviewed Apr 11, 2022

View reviewed changes

src/librustdoc/doctest.rs Outdated Show resolved Hide resolved

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 Apr 11, 2022

workingjubilee changed the title ~~Use rust_out{,.exe,.wasm} for doctests~~ Use rust_out{target_exe_suffix} for doctests Apr 11, 2022

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2022

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 Apr 22, 2022

rustbot added the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Nov 27, 2022

workingjubilee reopened this Nov 27, 2022

workingjubilee force-pushed the doctest-exe branch 2 times, most recently from 670a69a to 9808534 Compare November 27, 2022 03:27

workingjubilee added 2 commits November 26, 2022 20:06

Use target exe_suffix for doctests

353cef9

This will use rust_out.exe for doctests on Windows, rust_out.wasm for doctests in the wasm case, and also handles cross-compiling or user-provided targets.

Attempt to solve problem with globs

47ddca6

workingjubilee force-pushed the doctest-exe branch from 9808534 to 47ddca6 Compare November 27, 2022 04:09

workingjubilee changed the title ~~Use rust_out{target_exe_suffix} for doctests~~ Use rust_out{exe_suffix} for doctests Nov 27, 2022

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 Nov 27, 2022

workingjubilee removed the S-inactive Status: Inactive and waiting on the author. This is often applied to closed PRs. label Nov 27, 2022

matthiaskrgr mentioned this pull request Nov 27, 2022

Rollup of 8 pull requests #104970

Closed

matthiaskrgr mentioned this pull request Nov 27, 2022

Rollup of 7 pull requests #104972

Closed

This was referenced Nov 27, 2022

Rollup of 7 pull requests #104974

Closed

Rollup of 8 pull requests #104983

Merged

bors merged commit 7ce937f into rust-lang:master Nov 27, 2022

rustbot added this to the 1.67.0 milestone Nov 27, 2022

workingjubilee deleted the doctest-exe branch September 19, 2024 22:01

Uh oh!

Conversation

workingjubilee commented Apr 9, 2022

Uh oh!

rust-highfive commented Apr 9, 2022

Uh oh!

ChrisDenton commented Apr 9, 2022

Uh oh!

workingjubilee commented Apr 9, 2022

Uh oh!

notriddle commented Apr 9, 2022

Uh oh!

bors commented Apr 9, 2022

Uh oh!

Uh oh!

notriddle commented Apr 11, 2022

Uh oh!

workingjubilee commented Apr 11, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

workingjubilee commented Apr 12, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

notriddle commented Apr 22, 2022

Uh oh!

bors commented Apr 22, 2022

Uh oh!

bors commented Apr 23, 2022

Uh oh!

bors commented Apr 23, 2022

Uh oh!

jyn514 commented Nov 27, 2022

Uh oh!

workingjubilee commented Nov 27, 2022

Uh oh!

workingjubilee commented Nov 27, 2022

Uh oh!

notriddle commented Nov 27, 2022

Uh oh!

bors commented Nov 27, 2022

Uh oh!

workingjubilee commented Nov 27, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

workingjubilee commented Apr 11, 2022 •

edited

Loading

workingjubilee commented Apr 12, 2022 •

edited

Loading