Skip to content

Rollup of 10 pull requests - #52655

Merged
bors merged 21 commits into
rust-lang:masterfrom
kennytm:rollup
Jul 24, 2018
Merged

Rollup of 10 pull requests#52655
bors merged 21 commits into
rust-lang:masterfrom
kennytm:rollup

Conversation

@kennytm

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

ljedrzand others added 21 commits July 19, 2018 16:36
Reduce misconceptions about Cursor being more general than it really is.
Fixes: rust-lang#52470
Instead, rely on alignment and use usize::MAX as sentinel.
Since NonNull is Copy the inner field of the cloned Waker was copied for
use in the new LocalWaker, however this left Waker to be dropped. Which
means that when cloning LocalWaker would also erroneously call drop_raw.
This change forgets the Waker, rather then dropping it, leaving the
inner field to be used by the returned LocalWaker.
Closesrust-lang#52629.
Cursor: update docs to clarify Cursor only works with in-memory buffers
Reduce misconceptions about Cursor being more general than it really is.
Fixes: rust-lang#52470
Do not suggest using `to_owned()` on `&str += &str`
- Don't provide incorrect suggestion for `&str += &str` (fixrust-lang#52410)
- On `&str + String` suggest `&str.to_owned() + &String` as a single suggestion
Fix color detection for Windows msys terminals.
Updates atty to pull in the fixsoftprops/atty#28. Closesrust-lang/cargo#5724.
…t, r=alexcrichton
Compile rustc before building tests for rustdoc
r? @alexcrichton
Don't use NonNull::dangling as sentinel value in Rc, Arc
Instead, rely on alignment and use usize::MAX as sentinel.
Cc rust-lang#52508
r? @joshtriplett
… r=cramertj
Forget Waker when cloning LocalWaker
Since NonNull is Copy the inner field of the cloned Waker was copied for
use in the new LocalWaker, however this left Waker to be dropped. Which
means that when cloning LocalWaker would also erroneously call drop_raw.
This change forgets the Waker, rather then dropping it, leaving the
inner field to be used by the returned LocalWaker.
Closesrust-lang#52629.
Simplify 2 functions in rustc_mir/dataflow
- `graphviz::outgoing`: the `enumerate` only provides indices; use a range instead
- `DataflowState::interpret_set`: change a push loop to an iterator and remove the `each_bit` helper function
…lacrum
Replace a few expect+format combos with unwrap_or_else+panic
That way the error strings won't be created if the related errors are not triggered.
@kennytm

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=10

@bors

bors commented Jul 24, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 3efc612 has been approved by kennytm

@borsbors 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, 2018
@bors

bors commented Jul 24, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3efc612 with merge baba500...

bors added a commit that referenced this pull request Jul 24, 2018
Rollup of 10 pull requests
Successful merges:
- #52538 (Remove obsolete flags in the i586_musl Dockerfile)
- #52548 (Cursor: update docs to clarify Cursor only works with in-memory buffers)
- #52605 (Do not suggest using `to_owned()` on `&str += &str`)
- #52621 (Fix color detection for Windows msys terminals.)
- #52622 (Use MultiSpan in E0707 and E709)
- #52627 (Compile rustc before building tests for rustdoc)
- #52637 (Don't use NonNull::dangling as sentinel value in Rc, Arc)
- #52640 (Forget Waker when cloning LocalWaker)
- #52641 (Simplify 2 functions in rustc_mir/dataflow)
- #52642 (Replace a few expect+format combos with unwrap_or_else+panic)
Failed merges:
r? @ghost
@bors

bors commented Jul 24, 2018

Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing baba500 to master...

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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.

10 participants

@kennytm@bors@Centril@ljedrz@tko@estebank@ehuss@Mark-Simulacrum@RalfJung@Thomasdezeeuw