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 11 pull requests #55433

Merged
merged 27 commits into from
Oct 28, 2018
Merged

Rollup of 11 pull requests #55433

merged 27 commits into from
Oct 28, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Oct 28, 2018

Successful merges:

SimonSapin and others added 20 commits October 17, 2018 15:54
Initially landed in rust-lang#48292
and reverted in rust-lang#50401.
This time, use `std::string::ParseError` as suggested in
rust-lang#44431 (comment)
Sometimes it *is* initialized!
When inlining a function using the Mir inliner, we shouldn't rerun the
various Mir passes on it because the Mir has already been lowered and
that wil break various early Mir passes.

The issue in rust-lang#50411 is that we've inlined a function with promotions
whose Mir has already been lowered. The promotions are then copied into
the local function and we begin to run passes on their lowered Mir
which causes the ICE.

Fixes rust-lang#50411
This can be obtained via the `$mir_phase` value.
As suggested in the feedback for rust-lang#55244.

When I replaced the macro with a function, rustc started complaining
that there were two unused functions so I also removed those.
remove unused variable i in example String::with_capacity()
This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.
Implement FromStr for PathBuf

Initially landed in rust-lang#48292 and reverted in rust-lang#50401. This time, use `std::string::ParseError` as suggested in rust-lang#44431 (comment)
…akis

Don't rerun MIR passes when inlining

Fixes rust-lang#50411

r? @nikomatsakis

I updated your commit message with additional details. Let me know if any of that is incorrect. I also added the appropriate `compile-flags` directive to the test.

Thanks for you help on this!

cc @RalfJung related to your PR rust-lang#55086
Add MaybeUninit::new

Sometimes it *is* initialized!
@kennytm
Copy link
Member Author

kennytm commented Oct 28, 2018

@bors r+ p=9

@bors
Copy link
Contributor

bors commented Oct 28, 2018

📌 Commit bfe15b59c0c20173493bbaf82b2756358b679b6e has been approved by kennytm

@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 Oct 28, 2018
@kennytm kennytm changed the title Rollup of 9 pull requests Rollup of 8 pull requests Oct 28, 2018
@kennytm
Copy link
Member Author

kennytm commented Oct 28, 2018

@bors r+

Removed #55262 (high risk, maybe causing failure of #55425 (comment))

@bors
Copy link
Contributor

bors commented Oct 28, 2018

📌 Commit a6d97281a5481db835e101db3dc93bd5dff13469 has been approved by kennytm

@bors
Copy link
Contributor

bors commented Oct 28, 2018

⌛ Testing commit a6d97281a5481db835e101db3dc93bd5dff13469 with merge 8a21b8e099d1daf8afd39fcbd7106f4ef4fabaf4...

@kennytm
Copy link
Member Author

kennytm commented Oct 28, 2018

@bors treeclosed=1

Travis jobs are not starting due to https://www.traviscistatus.com/incidents/7k1r5btfg45m

@bjorn3
Copy link
Member

bjorn3 commented Oct 28, 2018

Travis incident is resolved.

@bors
Copy link
Contributor

bors commented Oct 28, 2018

💔 Test failed - status-appveyor

@bors bors 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 Oct 28, 2018
Remove unnecessary mut in iterator.find_map documentation example, R…

Relates to rust-lang#49098

Removes a mut that could induce newcomers to put a mut in their code that the compiler would comply about.

https://github.com/rust-lang/rust/pull/49098/files#r227422388
Update string.rs

remove unused variable i in example String::with_capacity()
Add ManuallyDrop::take

Tracking issue: rust-lang#55422

Proposed in this form in https://internals.rust-lang.org/t/mini-rfc-manuallydrop-take/8679,
see that thread for some history.

A small convenience wrapper for `ManuallyDrop` that makes a pattern (taking ownership of the contained data in drop) more obvious.
path suggestions in Rust 2018 should point out the change in semantics

Fixes rust-lang#55130.

This commit extends existing path suggestions to link to documentation
on the changed semantics of `use` in Rust 2018.
Allow extern statics with an extern type

Fixes rust-lang#55239
@kennytm kennytm changed the title Rollup of 8 pull requests Rollup of 11 pull requests Oct 28, 2018
@kennytm
Copy link
Member Author

kennytm commented Oct 28, 2018

@bors r+ treeclosed-

Removed #55304 (causing the error above)
Added #55421, #55185, #55257, #55199.

@bors
Copy link
Contributor

bors commented Oct 28, 2018

📌 Commit db4e77c has been approved by kennytm

@bors bors 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 Oct 28, 2018
@bors
Copy link
Contributor

bors commented Oct 28, 2018

⌛ Testing commit db4e77c with merge d492c67...

bors added a commit that referenced this pull request Oct 28, 2018
Rollup of 11 pull requests

Successful merges:

 - #55148 (Implement FromStr for PathBuf)
 - #55185 (path suggestions in Rust 2018 should point out the change in semantics)
 - #55191 (Fix sub-variant doc display)
 - #55199 (Impl items have generics)
 - #55244 (Don't rerun MIR passes when inlining)
 - #55252 (Add MaybeUninit::new)
 - #55257 (Allow extern statics with an extern type)
 - #55389 (Remove unnecessary mut in iterator.find_map documentation example, R…)
 - #55406 (Update string.rs)
 - #55412 (Fix an ICE in the min_const_fn analysis)
 - #55421 (Add ManuallyDrop::take)
@bors
Copy link
Contributor

bors commented Oct 28, 2018

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

@bors bors merged commit db4e77c into rust-lang:master Oct 28, 2018
@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
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.