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 7 pull requests #68506

Merged
merged 16 commits into from
Jan 24, 2020
Merged

Rollup of 7 pull requests #68506

merged 16 commits into from
Jan 24, 2020

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Jan 24, 2020

Successful merges:

Failed merges:

r? @ghost

estebank and others added 16 commits January 21, 2020 11:11
Fixes rust-lang#68368

Previously, I assumed that the substs contained only types, which caused
the computed index number to be wrong.
The call to `count` on the inner iterator can overflow even if `Skip` itself would return less that `usize::max_value()` items.
This change adds the x86_64-fuchsia and aarch64-fuchsia LLVM targets to
those allowed to invoke -Zsanitizer. Currently, the only overlap between
compiler_rt sanitizers supported by both rustc and Fuchsia is ASan.
This was a typo that slipped in, and meant that we were still not properly
clearing out std.
…y-vec, r=davidtwco

Suggest borrowing `Vec<NonCopy>` in for loop

Partially address rust-lang#64167.
…estebank

Account for non-types in substs for opaque type error messages

Fixes rust-lang#68368

Previously, I assumed that the substs contained only types, which caused
the computed index number to be wrong.
Avoid overflow in `std::iter::Skip::count`

The call to `count` on the inner iterator can overflow even if `Skip` itself would return less that `usize::max_value()` items.

Fixes rust-lang#68139
…r=alexcrichton

Enable ASan on Fuchsia

This change adds the x86_64-fuchsia and aarch64-fuchsia LLVM targets to
those allowed to invoke -Zsanitizer. Currently, the only overlap between
compiler_rt sanitizers supported by both rustc and Fuchsia is ASan.
Implement `unused_parens` for block return values

Fixes rust-lang#68386

r? @Centril
…ing, r=alexcrichton

Clear out std, not std tools

This was a typo that slipped in, and meant that we were still not properly
clearing out std.

This is basically rust-lang#67760 but actually correct...
@tmandry
Copy link
Member Author

tmandry commented Jan 24, 2020

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Jan 24, 2020

📌 Commit 7f8a61d has been approved by tmandry

@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 Jan 24, 2020
@tmandry tmandry added the rollup A PR which is a rollup label Jan 24, 2020
@bors
Copy link
Contributor

bors commented Jan 24, 2020

⌛ Testing commit 7f8a61d with merge dee12bb...

bors added a commit that referenced this pull request Jan 24, 2020
Rollup of 7 pull requests

Successful merges:

 - #68424 (Suggest borrowing `Vec<NonCopy>` in for loop)
 - #68438 (Account for non-types in substs for opaque type error messages)
 - #68469 (Avoid overflow in `std::iter::Skip::count`)
 - #68473 (Enable ASan on Fuchsia)
 - #68479 (Implement `unused_parens` for block return values)
 - #68483 (Add my (@flip1995) name to .mailmap)
 - #68500 (Clear out std, not std tools)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 24, 2020

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing dee12bb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 24, 2020
@bors bors merged commit 7f8a61d into rust-lang:master Jan 24, 2020
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.

9 participants