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 15 pull requests #62782

Merged
merged 36 commits into from
Jul 18, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

scottmcm and others added 30 commits July 3, 2019 00:05
Ok, I can't use `std` in doc-links, only in doc-tests.  Try 7...
When `rustc` is invoked with the `--print` argument, we don't actually
generate any code (unless it's the `native-static-libs` option). So we
don't need to error our in this case since there's no risk of generating
either LLVM assertions or corrupted binaries.
Change some tests to `check-pass` that are only testing name resolution.
`normalize-stdout-test` removes the need for Make, and it can be updated
with `--bless` this way
Per rust-lang#59356 it is expected that the interpretation of the bitmask depends
on target endianness.

Closes rust-lang#59356
…acrum

Fix hyperlinks in From impls between Vec and VecDeque

I'd been trying to link them, but apparently actually just added brackets: <https://doc.rust-lang.org/nightly/std/collections/struct.VecDeque.html#impl-From%3CVec%3CT%3E%3E>

~~This reverts commit 5168f5d.~~

~~(I'd previously tried to make relative links, but those failed linkcheck because the types are exported at different levels.  So just skip the links -- they're already linked in the function signature anyway.)~~

This makes the links now work.
 Only error about MSVC + PGO + unwind if we're generating code

In rust-lang#61853, we changed the error when using PGO & MSVC toolchain & panic=unwind into a warning. However, in the compiler team meeting on 2019-07-11, we found that not everybody was in favor of that change because of the possibility of broken binaries.

This PR reverts that change so this is again an error. However, to work around an [issue the Firefox team is having](rust-lang#61002 (comment)), we will only emit the error if we're actually supposed to generate a binary. If the `rustc` is invoked with `--print` arguments (which means that no binary will actually be emitted), then we won't emit the error because there is not a possibility of the issue occurring.

cc @EricRahm @nikomatsakis @pnkfelix @Centril
Check that trait is exported or public before adding hint

Closes rust-lang#62194.

This PR checks the `AccessLevels` of a trait to check whether adding the intercrate ambiguity hint is valid or not.

I am unsure of both the use of `.unwrap()` as well as removing hints for [downstream *and* [upstream](https://github.com/rust-lang/rust/blob/92b0f52584c9375505ecdefdd7855b93a5919d51/src/librustc/traits/select.rs#L112-L142).
Update the help message on error for self type

Fix rust-lang#62609
…nas-schievink

Fix repeated wording in slice documentation

Changes `of the slice of the slice` to `of the slice` in the chunk- and friends documentation of slices
…ochenkov

Consolidate hygiene tests

Some general clean-up extracted out from another PR
Remove last use of mem::uninitialized from std::io::util

Addresses rust-lang#62397 for std::io::util
Add missing link to Infallible in TryFrom doc
update data_layout and features for armv7-wrs-vxworks
Disable Z3 in LLVM build

Avoid building LLVM with Z3 if it happens to be installed.

Fixes rust-lang#62750.

r? @alexcrichton
…_compiler_messages_p7, r=alexreg

normalize use of backticks in compiler messages for librustc/lint

rust-lang#60532
Disable simd_select_bitmask test on big endian

Per rust-lang#59356 it is expected that the interpretation of the bitmask depends
on target endianness.

Closes rust-lang#59356
…sion, r=eddyb

Self-referencial type now called a recursive type

As per Boat's suggestion - rust-lang#62539, this makes the error message clearer.
Emit artifact notifications for dependency files

Emit `dep-info` artifact notifications for `.d` files.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Jul 18, 2019

📌 Commit 396903b has been approved by Mark-Simulacrum

@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 Jul 18, 2019
@Mark-Simulacrum
Copy link
Member Author

@bors p=10

@bors
Copy link
Contributor

bors commented Jul 18, 2019

⌛ Testing commit 396903b with merge 311376d...

bors added a commit that referenced this pull request Jul 18, 2019
Rollup of 15 pull requests

Successful merges:

 - #61926 (Fix hyperlinks in From impls between Vec and VecDeque)
 - #62615 ( Only error about MSVC + PGO + unwind if we're generating code)
 - #62696 (Check that trait is exported or public before adding hint)
 - #62712 (Update the help message on error for self type)
 - #62728 (Fix repeated wording in slice documentation)
 - #62730 (Consolidate hygiene tests)
 - #62732 (Remove last use of mem::uninitialized from std::io::util)
 - #62740 (Add missing link to Infallible in TryFrom doc)
 - #62745 (update data_layout and features for armv7-wrs-vxworks)
 - #62749 (Document link_section arbitrary bytes)
 - #62752 (Disable Z3 in LLVM build)
 - #62764 (normalize use of backticks in compiler messages for librustc/lint)
 - #62774 (Disable simd_select_bitmask test on big endian)
 - #62777 (Self-referencial type now called a recursive type)
 - #62778 (Emit artifact notifications for dependency files)

Failed merges:

 - #62746 ( do not use mem::uninitialized in std::io)

r? @ghost
@bors
Copy link
Contributor

bors commented Jul 18, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing 311376d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 18, 2019
@bors bors merged commit 396903b into rust-lang:master Jul 18, 2019
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #62782!

Tested on commit 311376d.
Direct link to PR: #62782

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jul 18, 2019
Tested on commit rust-lang/rust@311376d.
Direct link to PR: <rust-lang/rust#62782>

💔 clippy-driver on windows: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
💔 clippy-driver on linux: test-pass → test-fail (cc @Manishearth @llogiq @mcarton @oli-obk @phansch, @rust-lang/infra).
matthiaskrgr added a commit to matthiaskrgr/rust-clippy that referenced this pull request Jul 18, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Jul 19, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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.