Skip to content

Rollup of 8 pull requests - #72202

Merged
bors merged 19 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-6lbxh1s
May 14, 2020
Merged

Rollup of 8 pull requests#72202
bors merged 19 commits into
rust-lang:masterfrom
Dylan-DPC-zz:rollup-6lbxh1s

Conversation

@Dylan-DPC-zz

Copy link
Copy Markdown

Successful merges:

Failed merges:

r? @ghost

mibac138and others added 19 commits May 5, 2020 02:21
Co-authored-by: Bastian Kauschke <bastian_kauschke@hotmail.de>
Because there is at most one file.
Fix unused_parens false positive when using binary operations
Fixesrust-lang#71290
r? @cuviper who provided instructions
…matsakis
Fix hang in lexical_region_resolve
Regionck was stuck in a loop where a region value was changing between two equal regions.
Closesrust-lang#72051
…d_files, r=alexcrichton
Change `WorkProduct::saved_files` to an `Option`.
Because there is at most one file.
r? @bjorn3
…E0228, r=petrochenkov
add long error explanation for E0228
Add long explanation for the E0228 error code
Part of rust-lang#61137
Let me know if this is wrong at all (or can be written more clearly), I'm still learning Rust.
Warn against thread::sleep in async fn
I've seen `thread::sleep` wrecking havoc in async servers. There's already an [issue for clippy](rust-lang/rust-clippy#4377), but the std docs could warn against it too.
use `require_lang_item` over `unwrap`.
Does not yet replace all uses of `lang_items\(\)\.*\.unwrap\(\)`, as there are more
than I expected 😅
Fixesrust-lang#72099
r? @RalfJung
*edit: The goal of this this PR is to change ICE from missing lang items to a fatal error.*
…tebank
Don't ICE on missing `Unsize` impl
Previously code of the form
```rust
#![feature(unsize, dispatch_from_dyn)]
use std::marker::Unsize;
use std::ops::DispatchFromDyn;
pub struct Foo<'a, T: ?Sized> {
_inner: &'a &'a T,
}
impl<'a, T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Foo<'a, U>> for Foo<'a, T> {}
```
would generate an ICE due to the missing `Unsize` impl being run through the `suggest_change_mut` suggestion. This PR adds an early exit and a pointer to the appropriate docs regarding `Unsize` instead:
```
error[E0277]: the trait bound `&'a T: std::marker::Unsize<&'a U>` is not satisfied
--> src/test/ui/issues/issue-71036.rs:11:1
|
11 | impl<'a, T: ?Sized + Unsize<U>, U: ?Sized> DispatchFromDyn<Foo<'a, U>> for Foo<'a, T> {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `std::marker::Unsize<&'a U>` is not implemented for `&'a T`
|
= note: all implementations of `Unsize` are provided automatically by the compiler, see <https://doc.rust-lang.org/stable/std/marker/trait.Unsize.html> for more information
= note: required because of the requirements on the impl of `std::ops::DispatchFromDyn<&'a &'a U>` for `&'a &'a T`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0277`.
```
r? @estebankResolvesrust-lang#71036
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors r+ rollup=never p=8

@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 7b5bc61 has been approved by Dylan-DPC

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7b5bc61 with merge cccfcaad3829e903bd404f529683c68e5523a881...

@RalfJung

Copy link
Copy Markdown
Member

@rustbot modify labels: +rollup

@rustbotrustbot added the rollup A PR which is a rollup label May 14, 2020
@RalfJungRalfJung mentioned this pull request May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 May 14, 2020
@RalfJung

Copy link
Copy Markdown
Member

@bors retry
@rust-lang/infra this might or might not be #71988 -- the " run the build" step on the macOS builder took 45min but it doesn't show any log output?!?

@borsbors 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 May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7b5bc61 with merge 2a1af5de149d98ca069b79d6551b385fff6eb7e5...

@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 May 14, 2020
@Dylan-DPC-zz

Copy link
Copy Markdown
Author

@bors retry

@borsbors 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 May 14, 2020
@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7b5bc61 with merge a74d186...

@bors

bors commented May 14, 2020

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label May 14, 2020
@bors
bors merged commit a74d186 into rust-lang:masterMay 14, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.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.

13 participants

@Dylan-DPC-zz@bors@RalfJung@rustbot@mibac138@matthewjasper@nnethercote@kornelski@imogenkinsman@lcnr@GuillaumeGomez@cofibrant@Dylan-DPC