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 4 pull requests #60351

Merged
merged 10 commits into from
Apr 28, 2019
Merged

Rollup of 4 pull requests #60351

merged 10 commits into from
Apr 28, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Apr 28, 2019

Successful merges:

Failed merges:

r? @ghost

nathankleyn and others added 10 commits April 17, 2019 08:11
Previously there wasn't any documentation to show what the type of
`Item` was inside `std::env::SplitPaths`. Now, in the same format as
other examples of docs in `srd` for `Iterator#Item`, we mention the
type.

This fixes rust-lang#59543.
It looks like the `OutputType::Metadata` kind in the compiler was
misclassified in rust-lang#38571 long ago by accident as incompatible with
codegen units and a single output file. This means that if you emit both
a linkable artifact and metadata it silently turns off multiple codegen
units unintentionally!

This commit corrects the situation to ensure that if `--emit metadata`
is used it doesn't implicitly disable multiple codegen units. This will
ensure we don't accidentally regress compiler performance when striving
to implement pipelined compilation!
Document `Item` type in `std::env::SplitPaths` iterator.

Previously there wasn't any documentation to show what the type of
`Item` was inside `std::env::SplitPaths`. Now, in the same format as
other examples of docs in `std` for `Iterator#Item`, we mention the
type.

This fixes rust-lang#59543.

r? @steveklabnik
…oli-obk

rustc: Flag metadata compatible with multiple CGUs

It looks like the `OutputType::Metadata` kind in the compiler was
misclassified in rust-lang#38571 long ago by accident as incompatible with
codegen units and a single output file. This means that if you emit both
a linkable artifact and metadata it silently turns off multiple codegen
units unintentionally!

This commit corrects the situation to ensure that if `--emit metadata`
is used it doesn't implicitly disable multiple codegen units. This will
ensure we don't accidentally regress compiler performance when striving
to implement pipelined compilation!
…sper

Remove `-Z two-phase-borrows` and `-Z two-phase-beyond-autoref`

fixes rust-lang#60331
@Centril
Copy link
Contributor Author

Centril commented Apr 28, 2019

@bors r+ p=4

@bors
Copy link
Contributor

bors commented Apr 28, 2019

📌 Commit fe52f8e has been approved by Centril

@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 Apr 28, 2019
@bors
Copy link
Contributor

bors commented Apr 28, 2019

⌛ Testing commit fe52f8e with merge 012c300...

bors added a commit that referenced this pull request Apr 28, 2019
Rollup of 4 pull requests

Successful merges:

 - #60022 (Document `Item` type in `std::env::SplitPaths` iterator.)
 - #60270 (rustc: Flag metadata compatible with multiple CGUs)
 - #60325 (Document ast::ExprKind::Type)
 - #60347 (Remove `-Z two-phase-borrows` and `-Z two-phase-beyond-autoref`)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Apr 28, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 012c300 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 28, 2019
@bors bors merged commit fe52f8e into rust-lang:master Apr 28, 2019
@Centril Centril deleted the rollup-5xv3tka branch April 28, 2019 15:40
@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
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.

5 participants