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 12 pull requests #74710

Merged
merged 29 commits into from
Jul 24, 2020
Merged

Rollup of 12 pull requests #74710

merged 29 commits into from
Jul 24, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

GuillaumeGomez and others added 29 commits July 17, 2020 10:12
We can deprecate non-stable/unstable items.
This should not be a change in behavior.
Ayu has it. Adding similar rule to other themes makes users less
surprised and makes GUI more consistent.
…earth

Improve doc theme logo display

Fixes rust-lang#74350.

The first commit cleans up the whitespaces and converts them to tabs. We should definitely write a tidy check for this (will do it in another PR).

Screenshots:

![Screenshot from 2020-07-15 14-08-25](https://user-images.githubusercontent.com/3050060/87543748-8581c800-c6a5-11ea-8417-cbf98ebbfd10.png)
![Screenshot from 2020-07-15 14-11-59](https://user-images.githubusercontent.com/3050060/87543747-84e93180-c6a5-11ea-8cea-976b1470e809.png)
![Screenshot from 2020-07-15 14-12-12](https://user-images.githubusercontent.com/3050060/87543745-84509b00-c6a5-11ea-8324-c3c46ab2d9ef.png)

r? @lzutao
cc @Cldfire
…illaumeGomez

Add right border bar to Dark and Light theme

Demo:
Light theme: rust-lang#74504 (comment)
Dark theme: rust-lang#74504 (comment)
Ayu theme: rust-lang#74504 (comment)
…=petrochenkov

Internally unify rustc_deprecated and deprecated

This PR intentionally tries to be "featureless" in that the behavior is not altered for either attribute, though it more clearly exposes cases where that is the case in the code.
polymorphize GlobalAlloc::Function

this sadly does not change rust-lang#74614

r? @eddyb
Don't ICE on unconstrained anonymous lifetimes inside associated types.

Fixes rust-lang#62200. The change here is inspired (copied) by how this case is handled on bare fns at https://github.com/rust-lang/rust/blob/e8b55a4ad230ebec762fdfc4f241ba98a98560af/src/librustc_typeck/astconv.rs#L3083-L3106.
…ulacrum

More BTreeMap test cases, some exposing undefined behaviour

Gathered from other ongoing PRs and all either blessed or ignored by Miri

r? @Mark-Simulacrum
Remove needless unsafety from BTreeMap::drain_filter

Remove one piece of unsafe code in the iteration over the iterator returned by BTreeMap::drain_filter.
- Changes an explicitly unspecified part of the API: when the user-supplied predicate (or some of BTreeMap's code) panicked, and the caller tries to use the iterator again, we no longer offer the same key/value pair to the predicate again but pretend the iterator has finished. Note that Miri does not find UB in the test case added here with the unsafe code (or without).
- Makes the code a little easier on the eyes.
- Makes the code a little harder on the CPU:
```
benchcmp c0 c2 --threshold 3
 name                                         c0 ns/iter  c2 ns/iter  diff ns/iter  diff %  speedup
 btree::set::clone_100_and_drain_all          2,794       2,900                106   3.79%   x 0.96
 btree::set::clone_100_and_drain_half         2,604       2,964                360  13.82%   x 0.88
 btree::set::clone_10k_and_drain_half         287,770     322,755           34,985  12.16%   x 0.89
```
r? @Amanieu
Add missing backticks in diagnostics note
Fix ICE while building MIR with type errors

See rust-lang#74047 (comment) for background. Replacing a binding with `PatKind::Wild` (introduced in rust-lang#51789 and later refactored in rust-lang#67439) caused an ICE downstream while building MIR.

I noticed that taking this code out no longer triggers the ICEs it was added to prevent. I'm not sure what else changed, or if this change is _correct_, but it does seem to be passing ui tests at least.

r? @oli-obk
cc @estebank

Fixes rust-lang#74047.
@JohnTitor
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@rustbot rustbot added the rollup A PR which is a rollup label Jul 24, 2020
@bors
Copy link
Contributor

bors commented Jul 24, 2020

📌 Commit 01b069d has been approved by JohnTitor

@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 24, 2020
@JohnTitor
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Jul 24, 2020

⌛ Testing commit 01b069d with merge 9008693...

@bors
Copy link
Contributor

bors commented Jul 24, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: JohnTitor
Pushing 9008693 to master...

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.