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

Rollup of 6 pull requests #71059

Merged
merged 16 commits into from
Apr 12, 2020
Merged

Rollup of 6 pull requests #71059

merged 16 commits into from
Apr 12, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

luca-barbieri and others added 16 commits April 11, 2020 11:07
rustc_session exports it for other crates to avoid mismatching
crate versions.
The code was broken because it printed "llvm-config" instead of the
absolute path to the llvm-config executable, causing Cargo to always
rebuild librustc_llvm if using system LLVM.

Also, it's not the build system's job to rebuild when a system library
changes, so we simply don't emit "rerun-if-changed" if a path to LLVM
was not explicitly provided.
x.py sets it unconditionally, so want it for plain "cargo build".

We need to load one of the panic runtimes that is in src (vs. pre-built in the
compiler's sysroot) to ensure that we don't load libpanic_unwind from the
sysroot. That would lead to a load of libcore, also from the sysroot, and create
lots of errors about duplicate lang items.
The compiler normalizes source when reading files initially (removes BOMs, etc), but not when loading external sources.

Fixes rust-lang#70874 by normalizing when loading external sources too. Adds a test to verify normalization.
I was looking into improving some Clippy documentation but was missing a
place that explains the `kw` and `sym` modules from rustc.
…-Simulacrum

Partial work on building with Cargo

This cherry picks the commits I'm directly approving from rust-lang#70999, I want to land them so that that PR is smaller.
…schievink

Update links of `rustc guide`

Picks up the things we left behind in the transition, hopefully they're last ones.

r? @spastorino
Normalize source when loading external foreign source into SourceMap

The compiler normalizes source when reading files initially (removes BOMs, etc), but not when loading external sources.

This leads to the external source matching according to the `src_hash`, but differing internally because it was not normalized.

Fixes rust-lang#70874.
…-DPC

Add some basic docs to `sym` and `kw` modules

I was looking into improving some Clippy documentation but was missing a
place that explains the `kw` and `sym` modules from rustc.

This adds some very basic usage documentation to these modules.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Apr 12, 2020

📌 Commit e684630 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 12, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Apr 12, 2020
@bors
Copy link
Contributor

bors commented Apr 12, 2020

⌛ Testing commit e684630 with merge 2398e5a0466495a8abb20962a0a62f1b64093b13...

@bors
Copy link
Contributor

bors commented Apr 12, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2020
@Dylan-DPC-zz
Copy link
Author

spurious

@bors retry

@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 Apr 12, 2020
@bors
Copy link
Contributor

bors commented Apr 12, 2020

⌛ Testing commit e684630 with merge 3712e11...

@bors
Copy link
Contributor

bors commented Apr 12, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing 3712e11 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 12, 2020
@bors bors merged commit 3712e11 into rust-lang:master Apr 12, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #71059!

Tested on commit 3712e11.
Direct link to PR: #71059

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
💔 rustfmt on windows: test-pass → build-fail (cc @topecongiro).
💔 rustfmt on linux: test-pass → build-fail (cc @topecongiro).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 12, 2020
Tested on commit rust-lang/rust@3712e11.
Direct link to PR: <rust-lang/rust#71059>

💔 rls on windows: test-pass → build-fail (cc @Xanewok).
💔 rls on linux: test-pass → build-fail (cc @Xanewok).
💔 rustfmt on windows: test-pass → build-fail (cc @topecongiro).
💔 rustfmt on linux: test-pass → build-fail (cc @topecongiro).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

9 participants