Uh oh!
There was an error while loading. Please reload this page.
Rollup of 8 pull requests - #70024
Merged
Merged
Conversation
This method is complementary for the feature refcell_leak added in an earlier PR. It allows reverting the effects of leaking a borrow guard by statically proving that such a guard could not longer exist. This was not added to the existing `get_mut` out of concern of impacting the complexity of the otherwise pure pointer cast and because the name `get_mut` poorly communicates the intent of resetting remaining borrows.
Use `ast::MacroDef` instead. Also remove `Session::imported_macro_spans`, external macros have spans now.
It was accidentally merged with the wrong version.
Correctly treat const generic parameters in fresh binding disambiguation
…tolnay Add undo_leak to reset RefCell borrow state This method is complementary for the feature cell_leak added in an earlier PR. It allows *safely* reverting the effects of leaking a borrow guard by statically proving that such a guard could not longer exist. This was not added to the existing `get_mut` out of concern of impacting the complexity of the otherwise pure pointer cast and because the name `get_mut` poorly communicates the intent of resetting remaining borrows. This is a follow-up to rust-lang#68712 and uses the same tracking issue, rust-lang#69099, as these methods deal with the same mechanism and the idea came up [in a review comment](rust-lang#68712 (comment)). @dtolnay who reviewed the prior PR. cc @RalfJung
ast: `Mac`/`Macro` -> `MacCall` It's now obvious that these refer to macro calls rather than to macro definitions. It's also a single name instead of two different names in different places. `rustc_expand` usually calls macro calls in a wide sense (including attributes and derives) "macro invocations", but structures and variants renamed in this PR are only relevant to fn-like macros, so it's simpler and clearer to just call them calls. cc rust-lang#63586 (comment) r? @eddyb
…ckler Implement From<&mut str> for String I ran into this missing impl when trying to do `String::from` on the result returned from this API in the `uuid` crate: https://docs.rs/uuid/0.8.1/uuid/adapter/struct.Hyphenated.html#method.encode_lower I wasn't sure what to put in the stability annotation. I'd appreciate some help with that :)
rustc_metadata: Remove `rmeta::MacroDef` And other related cleanups. Follow-up to rust-lang#66364. r? @Centril
resolve: Fix two issues in fresh binding disambiguation Prevent fresh bindings from shadowing ambiguity items. Fixesrust-lang#46079 Correctly treat const generic parameters in fresh binding disambiguation. Fixesrust-lang#68853
def_collector: Fully visit async functions We forgot to visit attributes previously, it caused ICEs. Special treatment of async functions is also moved from `visit_item` to `visit_fn` to reuse more of the default visitor. Fixesrust-lang#67778.
…-gate, r=oli-obk Return feature gate as a `Symbol` A minor refactoring that will be needed for rust-lang#68940. That PR is blocked on me changing the error comments in a whole lot of UI tests. r? @oli-obk
…e-since, r=Centril Fix "since" field for `Once::is_complete`'s `#[stable]` attribute It was accidentally merged with the wrong version in rust-lang#68945. Thanks @jplatte for noticing. This also needs to be beta backported.
Centril
commented
Mar 15, 2020
ContributorAuthor
@bors r+ p=8 rollup=never |
bors
commented
Mar 15, 2020
Collaborator
📌 Commit bde77af has been approved by |
bors
commented
Mar 15, 2020
Collaborator
bors
commented
Mar 15, 2020
Collaborator
☀️ Test successful - checks-azure |
This was referenced Mar 15, 2020
This was referenced Mar 15, 2020
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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:
Mac/Macro->MacCall#69589 (ast:Mac/Macro->MacCall)rmeta::MacroDef#69988 (rustc_metadata: Removermeta::MacroDef)Symbol#70013 (Return feature gate as aSymbol)Once::is_complete's#[stable]attribute #70018 (Fix "since" field forOnce::is_complete's#[stable]attribute)Failed merges:
r? @ghost