Skip to content

Add rustc-link-args to doctest build #9916

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Oct 14, 2021
Merged

Conversation

chansuke
Copy link
Contributor

@chansuke chansuke commented Sep 16, 2021

Fix #9895

@rust-highfive
Copy link

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

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 16, 2021
@chansuke chansuke changed the title WIP: Add rustc-link-args to doctest build Add rustc-link-args to doctest build Sep 18, 2021
@chansuke chansuke changed the title Add rustc-link-args to doctest build WIP: Add rustc-link-args to doctest build Sep 20, 2021
@ehuss
Copy link
Contributor

ehuss commented Oct 13, 2021

@chansuke Just checking in to see if you had any questions or needed any help with this.

@chansuke
Copy link
Contributor Author

@ehuss Thanks so much for your comment. I am stuck on a test. I have created the test but I think this is insufficient and probably need to update the test case but I am not sure what to do next.

.masquerade_as_nightly_cargo()
.without_status()
.with_stderr_contains(
"[RUNNING] `rustc --crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the test looks good, I would just change this line here to this:

Suggested change
"[RUNNING] `rustc --crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",
"[RUNNING] `rustdoc [..]--crate-name foo [..]-C link-arg=--this-is-a-bogus-flag[..]",

That will check that the flag is getting passed into rustdoc.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ehuss I will fix this, thanks.

@chansuke chansuke changed the title WIP: Add rustc-link-args to doctest build Add rustc-link-args to doctest build Oct 13, 2021
@chansuke chansuke requested a review from ehuss October 13, 2021 15:44
@ehuss
Copy link
Contributor

ehuss commented Oct 13, 2021

Thanks, can you squash the commits to a single one?

@ehuss
Copy link
Contributor

ehuss commented Oct 14, 2021

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 14, 2021

📌 Commit 2fabe52 has been approved by ehuss

@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 Oct 14, 2021
@bors
Copy link
Contributor

bors commented Oct 14, 2021

⌛ Testing commit 2fabe52 with merge bd6a512...

@bors
Copy link
Contributor

bors commented Oct 14, 2021

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing bd6a512 to master...

@bors bors merged commit bd6a512 into rust-lang:master Oct 14, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 19, 2021
Update cargo

6 commits in c7957a74bdcf3b11e7154c1a9401735f23ebd484..7fbbf4e8f23e3c24b8afff541dcb17e53eb5ff88
2021-10-11 20:17:07 +0000 to 2021-10-19 02:16:48 +0000
- Make future-incompat-report output more user-friendly (rust-lang/cargo#9953)
- Fix fetching git repos after a force push. (rust-lang/cargo#9979)
- Add rustc-link-args to doctest build (rust-lang/cargo#9916)
- Add the start of a basic benchmarking suite. (rust-lang/cargo#9955)
- Use forms for issue templates. (rust-lang/cargo#9970)
- Add rust_metadata to SerializedPackage (rust-lang/cargo#9967)
@ehuss ehuss added this to the 1.58.0 milestone Feb 6, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cargo:rustc-link-args not applied to doctest builds
5 participants