Rollup of 5 pull requests #64269
Merged
Rollup of 5 pull requests #64269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LLDB's expression parser can't unambiguously resolve local variables in some cases, as described in rust-lang#47938. Work around this by using names that don't shadow direct submodules of `core`.
Use it for feature-gating `#[bench]`
…050, r=alexcrichton Rename test locals to work around LLDB bug LLDB's expression parser can't unambiguously resolve local variables in some cases, as described in rust-lang#47938. Work around this by using names that don't shadow direct submodules of `core`. Closes rust-lang#64050.
Support "soft" feature-gating using a lint Use it for feature-gating `#[bench]`. Closes rust-lang#63798.
resolve: Do not afraid to set current module to enums and traits After rust-lang@cfbb60b it's ok. This is likely required for rust-lang#63468 to work correctly, because that PR starts resolving attributes on enum variants. r? @matthewjasper @c410-f3r
…=estebank Reduce span to function name in unreachable calls As title suggests, this might close rust-lang#64103. Refer to the updated tests for expected output. There is potential to further improve usability. In particular, is it favourable that the exact diverging expression/statement be pointed out (not only in this case, but for all unreachable code)? Certainly that would deserve another issue, but I'm interested in the opinions.
Add methods for converting `bool` to `Option<T>` This provides a reference implementation for rust-lang/rfcs#2757.
|
@bors r+ p=5 rollup=never |
|
📌 Commit cd3cb28 has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Sep 7, 2019
Rollup of 5 pull requests Successful merges: - #64052 (Rename test locals to work around LLDB bug) - #64066 (Support "soft" feature-gating using a lint) - #64177 (resolve: Do not afraid to set current module to enums and traits) - #64229 (Reduce span to function name in unreachable calls) - #64255 (Add methods for converting `bool` to `Option<T>`) Failed merges: r? @ghost
|
☀️ Test successful - checks-azure |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
booltoOption<T>#64255 (Add methods for convertingbooltoOption<T>)Failed merges:
r? @ghost