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 16 pull requests #73528

Merged
merged 47 commits into from
Jun 20, 2020
Merged

Rollup of 16 pull requests #73528

merged 47 commits into from
Jun 20, 2020

Conversation

Manishearth
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

lcnr and others added 30 commits May 28, 2020 13:02
Emit an error when incompatible sanitizer are configured through command
line options. Previously the last one configured prevailed and others
were silently ignored.

Additionally use a set to represent configured sanitizers, making it
possible to enable multiple sanitizers at once. At least in principle,
since currently all of them are considered to be incompatible with
others.
It does the same thing as `Deref` now
The `Call` terminator only works with `FnDef` and `FnPtr` types.
It happened to work with `Self` so far because it was always
substituted with the real type before being used.
No one actually works with src/tools/librustdoc, it's almost empty.
This is required to avoid cycles when evaluating auto trait
predicates.
This commit modifies the pretty printer and const eval in the MIR so
that `destructure_const` (used in `pretty_print_const_value`) can handle
enums with no variants (or types containing enums with no variants).

Signed-off-by: David Wood <[email protected]>
Make `need_type_info_err` more conservative

Makes sure arg patterns we are going to suggest on are actually contained within the span of the obligation that caused the inference error (credit to @lcnr for suggesting this fix).

There's a subtle trade-off regarding the handling of local patterns which I've left a comment about.

Resolves rust-lang#72690
…nikic

Diagnose use of incompatible sanitizers

Emit an error when incompatible sanitizer are configured through command
line options. Previously the last one configured prevailed and others
were silently ignored.

Additionally use a set to represent configured sanitizers, making it
possible to enable multiple sanitizers at once. At least in principle,
since currently all of them are considered to be incompatible with
others.
…tthewjasper

shim.rs: avoid creating `Call` terminators calling `Self`

Also contains some cleanup and doc comment additions so I could make sense of the code.

Fixes rust-lang#73109
Closes rust-lang#73175

r? @matthewjasper
…ark-Simulacrum

Add src/librustdoc as an alias for src/tools/rustdoc

No one actually works with src/tools/rustdoc, it's almost empty.

Closes rust-lang#73439
…const-val-enum-no-variants, r=oli-obk

pretty/mir: const value enums with no variants

Fixes rust-lang#72181.

This PR modifies the pretty printer and const eval in the MIR so that `destructure_const` (used in `pretty_print_const_value`) can handle enums with no variants (or types containing enums with no variants).

I'm not convinced that this is the correct approach, folks more familiar with `destructure_const` would be able to say - happy to adjust the PR. Looking through `destructure_const` and the functions that it invokes, it didn't seem like it was written to handle zero-variant-enums - I assume that case is handled earlier in some way so `destructure_const` doesn't need to under normal circumstances. It didn't seem like it would be straightforward to make `destructure_const` handle this case in a first-class-feeling way (e.g. adding a `Variants::None` variant), so this PR makes some minimal changes to avoid ICEs.
Unify region variables when projecting associated types

This is required to avoid cycles when evaluating auto trait predicates.
Notably, this is required to be able add Chalk types to `CtxtInterners` for `cfg(parallel_compiler)`.

r? @nikomatsakis
…ckler

Update the doc for std::prelude to the correct behavior

Fixes rust-lang#64686.

One line change to ensure the docs are correct about the behavior of the compiler when inserting`std::prelude::v1`.

I don't think examples are necessary but I can add some (especially those from the original issue) if needed.
@Manishearth
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Jun 20, 2020

📌 Commit 3e40cca has been approved by Manishearth

@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 Jun 20, 2020
@bors
Copy link
Contributor

bors commented Jun 20, 2020

⌛ Testing commit 3e40cca with merge 033013c...

@Manishearth
Copy link
Member Author

@bors treeclosed=9

I plan to open another rollup after this, will cancel this before I disappear, but if not feel free to cancel if an hour has passed

@bors
Copy link
Contributor

bors commented Jun 20, 2020

☀️ Test successful - checks-azure
Approved by: Manishearth
Pushing 033013c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2020
@bors bors merged commit 033013c into rust-lang:master Jun 20, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #73528!

Tested on commit 033013c.
Direct link to PR: #73528

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 20, 2020
Tested on commit rust-lang/rust@033013c.
Direct link to PR: <rust-lang/rust#73528>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @topecongiro).
🎉 rustfmt on linux: build-fail → test-pass (cc @topecongiro).
@Manishearth Manishearth deleted the rollup-7djz8nd branch June 20, 2020 06:59
@Manishearth
Copy link
Member Author

Onto the next batch!

@nnethercote
Copy link
Contributor

One of these PRs resulted in a win on the wg-grammar benchmark.

@cuviper cuviper added this to the 1.46 milestone May 2, 2024
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. 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.