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 15 pull requests #54146

Merged
merged 38 commits into from
Sep 12, 2018
Merged

Rollup of 15 pull requests #54146

merged 38 commits into from
Sep 12, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Sep 12, 2018

Note: The [relnote] tag refers to #54072.


Successful merges:

Failed merges:

r? @ghost

DiamondLovesYou and others added 30 commits August 20, 2018 16:26
Allow target specs to disable that attribute.
The error value now includes the type of the success.
The success value now includes the type of the error.
map_or_else is now correctly labelled unstable and points to the
tracking issue on rust-lang/rust
Brings the documentation in line with the BufReader implementation.

Fixes rust-lang#48022.
This change is in response to rust-lang#53125.
The patch makes the feature accepted and removes the tests that tested the
non-accepted status of the feature.
Making it consistent across the board, as most of them already use `$`.

Also split one continues bash run into two, to make it easier see
different runs: one with warning and another with error.
modified to read "the first table overflows into the second, and the second into the first." plus smaller typos
Fix a few AMDGPU related issues

* AMDGPU ignores `noinline` and sadly doesn't clear the attribute when it slaps `alwaysinline` on everything,
* an AMDGPU related load bit range metadata assertion,
* I didn't enable the `amdgpu` component in the `librustc_llvm` build script,
* Add AMDGPU call abi info.
Document .0 to unpack integer from Wrapping
…xcrichton

Implemented map_or_else for Result<T, E>

Fulfills rust-lang#53268
The example is ripped from `Option::map_or_else`, with the types corrected.
A few cleanups and minor improvements to rustc_passes

- prefer `if let` to `match` when only one branch matters
- prefer equality checks to pattern matching
- prefer `is_empty` to `len() == 0`
- collapse a couple of `if` expressions
- rename `label` to `destination` when destructuring `hir::ExprKind::Continue`
- `derive Copy` for `Promotability`
- `impl BitAndAssign` for `Promotability`
- a few formatting fixes
- a few other minor cleanups
Update documentation for fill_buf in std::io::BufRead

Brings the documentation in line with the BufReader implementation.

Fixes rust-lang#48022.

This is my first PR, and I think the `E-easy` label is very cool, as so is the practice of describing the fix but leaving it for someone else; it really makes it a lot less intimidating to get started with something!
`&CStr`, not `CStr`, is the counterpart of `&str`
Stabilization change for mod.rs

This change is in response to rust-lang#53125.
The patch makes the feature accepted and removes the tests that tested the
non-accepted status of the feature.
…etMisdreavus

rustdoc: Remove generated blanket impls from trait pages

rust-lang#53801 only deduped the generated blanket impls but they shouldn't be displayed at all because the original blanket impl is already in the "Implementors" section. This also removes the impls from the sidebar.

Fixes rust-lang#53689

r? @QuietMisdreavus
…=Manishearth

Reexport CheckLintNameResult

Make the enum `CheckLintNameResult` public, so that lint tools (aka Clippy) can use it together with [`LintStore::check_lint_name`](https://doc.rust-lang.org/nightly/nightly-rustc/rustc/lint/struct.LintStore.html#method.check_lint_name), to handle the case that a scoped `tool_lint` doesn't exist in the tool.

This is currently not handled by the compiler:
https://github.com/rust-lang/rust/blob/595345419d12c3ea860151df52f78744a31bafff/src/librustc/lint/levels.rs#L309-L314

Needed for rust-lang/rust-clippy#3161

r? @Manishearth
…acrum

Fix typos in libstd hash map

modified growth algo description to read "the first table overflows into the second, and the second into the first." plus smaller typos
…alexcrichton

Update LLVM to fix GlobalISel dbg.declare

Fixes rust-lang#49807.
…278, r=wesleywiser

Recover proper regression test for issue rust-lang#16278.

Spawned from my note rust-lang#19955 (comment)
@kennytm
Copy link
Member Author

kennytm commented Sep 12, 2018

@bors r+ p=15

@bors
Copy link
Contributor

bors commented Sep 12, 2018

📌 Commit 1fed251 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 Sep 12, 2018
@rust-highfive

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Sep 12, 2018

⌛ Testing commit 1fed251 with merge 289c63e897edc0a2fc53465f2141b7b0ad7172fb...

@bors
Copy link
Contributor

bors commented Sep 12, 2018

💔 Test failed - status-travis

@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 Sep 12, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member Author

kennytm commented Sep 12, 2018

@bors retry travis-ci/travis-ci#9696

@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 Sep 12, 2018
@bors
Copy link
Contributor

bors commented Sep 12, 2018

⌛ Testing commit 1fed251 with merge 8586ec6...

bors added a commit that referenced this pull request Sep 12, 2018
Rollup of 15 pull requests

Successful merges:

 - #52514 (Fix a few AMDGPU related issues)
 - #53703 (Document .0 to unpack integer from Wrapping)
 - #53777 (Implemented map_or_else for Result<T, E>)
 - #54031 (A few cleanups and minor improvements to rustc_passes)
 - #54046 (Update documentation for fill_buf in std::io::BufRead)
 - #54064 (`&CStr`, not `CStr`, is the counterpart of `&str`)
 - #54072 (Stabilization change for mod.rs)
 - #54073 (docs: Use dollar sign for all bash prompts)
 - #54074 (simplify ordering for Kind)
 - #54085 (Remove documentation about proc_macro being bare-bones)
 - #54087 (rustdoc: Remove generated blanket impls from trait pages)
 - #54106 (Reexport CheckLintNameResult)
 - #54107 (Fix typos in libstd hash map)
 - #54136 (Update LLVM to fix GlobalISel dbg.declare)
 - #54142 (Recover proper regression test for issue #16278.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 12, 2018

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

@bors bors merged commit 1fed251 into rust-lang:master Sep 12, 2018
@kennytm kennytm added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 13, 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
relnotes Marks issues that should be documented in the release notes of the next release. 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.