Skip to content

rustdoc: Don't modify library path for doctests - #56514

Merged
bors merged 1 commit into
rust-lang:masterfrom
ollie27:rustdoc_test_libdir
Feb 19, 2019
Merged

rustdoc: Don't modify library path for doctests#56514
bors merged 1 commit into
rust-lang:masterfrom
ollie27:rustdoc_test_libdir

Conversation

@ollie27

Copy link
Copy Markdown
Contributor

It shouldn't be needed anymore because doctests are no longer compiled with prefer-dynamic (since #54939).

r? @QuietMisdreavus

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 4, 2018
@QuietMisdreavus

Copy link
Copy Markdown
Contributor

This feels like something that could use a crater run...

@QuietMisdreavus

Copy link
Copy Markdown
Contributor

Just to sate my paranoia, i'm going to try to run this through crater. First step...

@bors try

@bors

bors commented Dec 4, 2018

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 7dd34d505bcccad927fa1f62414ee0294d1e4c0b with merge 6eb0fd3ac58f9b16bddb9924a17c3b6c156aa468...

@bors

bors commented Dec 4, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-travis
State: approved= try=True

@QuietMisdreavus

Copy link
Copy Markdown
Contributor

@craterbot run start=master#906deae0790bd18681b937fe9a141a3c26cf1855 end=try#6eb0fd3ac58f9b16bddb9924a17c3b6c156aa468 mode=build-and-test

@craterbot

Copy link
Copy Markdown
Collaborator

👌 Experiment pr-56514 created and queued.
🔍 You can check out the queue and this experiment's details.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbotcraterbot added S-waiting-on-crater Status: Waiting on a crater run to be completed. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 4, 2018
@craterbot

Copy link
Copy Markdown
Collaborator

🚧 Experiment pr-56514 is now running on agent aws-1.

ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbot

Copy link
Copy Markdown
Collaborator

🎉 Experiment pr-56514 is completed!
📊 17 regressed and 15 fixed (50140 total)
📰 Open the full report.

⚠️ If you notice any spurious failure please add them to the blacklist!
ℹ️ Crater is a tool to run experiments across parts of the Rust ecosystem. Learn more

@craterbotcraterbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-crater Status: Waiting on a crater run to be completed. labels Dec 8, 2018
@QuietMisdreavus

Copy link
Copy Markdown
Contributor

All of the legit failures look like docmatic-style tests where people run doctests from their README by calling rustdoc directly. I guess the directory they pass to rustdoc (-L target/debug/deps in most examples) has both the cfg(test) and cfg(not(test)) versions of the rlib in it, which confuses the crate loader.

However, the more i look at docmatic and skeptic reverse-deps, the more i see them everywhere on the report. I wonder if there's something else that's causing the failures, and this specific change isn't actually what's at fault.

Regardless, GitHub is now reporting a merge conflict.

@QuietMisdreavusQuietMisdreavus 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 Dec 20, 2018
@XAMPPRocky

Copy link
Copy Markdown
Contributor

Triage; @ollie27 Hello, have you been able to get back to this PR?

@bors

bors commented Jan 18, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #56189) made this pull request unmergeable. Please resolve the merge conflicts.

It shouldn't be needed anymore because doctests are no longer compiled with `prefer-dynamic`.
@ollie27

Copy link
Copy Markdown
ContributorAuthor

It doesn't look like any of those crater failures are because of this PR. Technically this PR does break running rustdoc -Cprefer-dynamic --test foo.rs but I don't know why anyone would do that.

@Dylan-DPC-zzDylan-DPC-zz added S-waiting-on-team and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 4, 2019
@QuietMisdreavus

Copy link
Copy Markdown
Contributor

Rustdoc taking arbitrary -C flags is fairly new (it was only added last year), so i don't think there's much risk of anyone doing that.

I'm going to go ahead and merge this PR - it's been sitting around long enough, and the Crater run showed that it doesn't affect anyone. Sorry for letting it sit forever!

@bors r+

@bors

bors commented Feb 18, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ad09d7f has been approved by QuietMisdreavus

@bors

bors commented Feb 18, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 160, this pull request will be tested once the tree is reopened

@borsbors 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-team labels Feb 18, 2019
@bors

bors commented Feb 19, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ad09d7f with merge fcccf06...

bors added a commit that referenced this pull request Feb 19, 2019
rustdoc: Don't modify library path for doctests
It shouldn't be needed anymore because doctests are no longer compiled with `prefer-dynamic` (since #54939).
r? @QuietMisdreavus
@bors

bors commented Feb 19, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-travis, status-appveyor
Approved by: QuietMisdreavus
Pushing fcccf06 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 19, 2019
@bors
bors merged commit ad09d7f into rust-lang:masterFeb 19, 2019
@ollie27
ollie27 deleted the rustdoc_test_libdir branch February 24, 2019 18:26
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

8 participants

@ollie27@QuietMisdreavus@bors@craterbot@Mark-Simulacrum@XAMPPRocky@rust-highfive@Dylan-DPC-zz