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.

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

Do not clobber RUSTDOCFLAGS #74514

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jul 19, 2020

We were setting these in both Builder::cargo and here, which ended up only setting the first of the two.

Fixes #74511

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 19, 2020
@ollie27
Copy link
Member

ollie27 commented Jul 19, 2020

From CI:

error[E0369]: binary operation `==` cannot be applied to type `impl AsRef<OsStr>`
    --> src/bootstrap/builder.rs:1474:9
     |
1474 |         assert_ne!(key, "RUSTFLAGS");
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
     |         |
     |         impl AsRef<OsStr>
     |         &str
     |
     = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

r=me with the above issue fixed.

We were setting these in both Builder::cargo and here, which ended up only
setting the first of the two.
@Mark-Simulacrum
Copy link
Member Author

@bors r=ollie27 rollup

@bors
Copy link
Contributor

bors commented Jul 19, 2020

📌 Commit be43319 has been approved by ollie27

@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 Jul 19, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 19, 2020
… r=ollie27

Do not clobber RUSTDOCFLAGS

We were setting these in both Builder::cargo and here, which ended up only setting the first of the two.

Fixes rust-lang#74511
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2020
…arth

Rollup of 9 pull requests

Successful merges:

 - rust-lang#73618 (Documentation for the false keyword)
 - rust-lang#74486 (Improve Read::read_exact documentation)
 - rust-lang#74514 (Do not clobber RUSTDOCFLAGS)
 - rust-lang#74516 (do not try fetching the ancestors of errored trait impls)
 - rust-lang#74520 (include backtrace folder in rust-src component)
 - rust-lang#74523 (Improve documentation for `core::fmt` internals)
 - rust-lang#74527 (Add myself to toolstate change notifications for rustfmt)
 - rust-lang#74534 (Only skip impls of foreign unstable traits)
 - rust-lang#74536 (fix documentation surrounding the `in` and `for` keywords)

Failed merges:

r? @ghost
@bors bors merged commit 3981386 into rust-lang:master Jul 20, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

nightly-rustc docs no longer document private items
5 participants