Merged
Conversation
Co-authored-by: Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
This change was mistakenly left out of rust-lang#103367
`MacArgs` is an enum with three variants: `Empty`, `Delimited`, and `Eq`. It's used in two ways: - For representing attribute macro arguments (e.g. in `AttrItem`), where all three variants are used. - For representing function-like macros (e.g. in `MacCall` and `MacroDef`), where only the `Delimited` variant is used. In other words, `MacArgs` is used in two quite different places due to them having partial overlap. I find this makes the code hard to read. It also leads to various unreachable code paths, and allows invalid values (such as accidentally using `MacArgs::Empty` in a `MacCall`). This commit splits `MacArgs` in two: - `DelimArgs` is a new struct just for the "delimited arguments" case. It is now used in `MacCall` and `MacroDef`. - `AttrArgs` is a renaming of the old `MacArgs` enum for the attribute macro case. Its `Delimited` variant now contains a `DelimArgs`. Various other related things are renamed as well. These changes make the code clearer, avoids several unreachable paths, and disallows the invalid values.
… r=dtolnay Pin::new_unchecked: discuss pinning closure captures Regardless of how the discussion in rust-lang#102737 turns out, pinning closure captures is super subtle business and probably worth discussing separately.
Fix using `include_bytes` in pattern position Fix rust-lang#104414
…er-errors Add a test case for async dyn* traits This adds a test case that approximates async functions in dyn traits using `dyn*`. The purpose is to have an example of where we are with `dyn*` and the goal of using it for dyn traits. Issue rust-lang#102425 r? `@compiler-errors`
…chenkov Split `MacArgs` in two. `MacArgs` is an enum with three variants: `Empty`, `Delimited`, and `Eq`. It's used in two ways: - For representing attribute macro arguments (e.g. in `AttrItem`), where all three variants are used. - For representing function-like macros (e.g. in `MacCall` and `MacroDef`), where only the `Delimited` variant is used. In other words, `MacArgs` is used in two quite different places due to them having partial overlap. I find this makes the code hard to read. It also leads to various unreachable code paths, and allows invalid values (such as accidentally using `MacArgs::Empty` in a `MacCall`). This commit splits `MacArgs` in two: - `DelimArgs` is a new struct just for the "delimited arguments" case. It is now used in `MacCall` and `MacroDef`. - `AttrArgs` is a renaming of the old `MacArgs` enum for the attribute macro case. Its `Delimited` variant now contains a `DelimArgs`. Various other related things are renamed as well. These changes make the code clearer, avoids several unreachable paths, and disallows the invalid values. r? `@petrochenkov`
…_output_trait_object-msg, r=eholk Probe + better error messsage for `need_migrate_deref_output_trait_object` 1. Use `InferCtxt::probe` in `need_migrate_deref_output_trait_object` -- that normalization *could* technically do type inference as a side-effect, and this is a lint, so it should have no side-effects. 2. Return the trait-ref so we format the error message correctly. See the UI test change -- `(dyn A + 'static)` is not a trait.
Move tests r? `@petrochenkov`
…mute, r=compiler-errors Do not check transmute if has non region infer close rust-lang#104609 See: rust-lang#104609 (comment) r? `@compiler-errors`
… r=GuillaumeGomez rustdoc: factor out common button CSS
…h-result, r=notriddle Migrate alias search result to CSS variables r? `@notriddle`
Make negative_impl and negative_impl_exists take the right types r? `@lcnr`
Update test's cfg-if dependency to 1.0 This change was mistakenly left out of rust-lang#103367 Finishes rust-lang#103365
rustbot
added
T-bootstrap
rustbot
added
S-waiting-on-review
Member
Author
|
@bors r+ rollup=never p=1 (queuing behind the current batch of |
Collaborator
bors
added
S-waiting-on-bors
Collaborator
Collaborator
|
☀️ Test successful - checks-actions |
Collaborator
|
📌 Perf builds for each rolled up PR: previous master: 28a53cdb46 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Collaborator
|
Finished benchmarking commit (0f7d817): comparison URL. Overall result: ❌✅ regressions and improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. |
flip1995
pushed a commit
to flip1995/rust
that referenced
this pull request
Dec 1, 2022
…iaskrgr Rollup of 11 pull requests Successful merges: - rust-lang#103396 (Pin::new_unchecked: discuss pinning closure captures) - rust-lang#104416 (Fix using `include_bytes` in pattern position) - rust-lang#104557 (Add a test case for async dyn* traits) - rust-lang#104559 (Split `MacArgs` in two.) - rust-lang#104597 (Probe + better error messsage for `need_migrate_deref_output_trait_object`) - rust-lang#104656 (Move tests) - rust-lang#104657 (Do not check transmute if has non region infer) - rust-lang#104663 (rustdoc: factor out common button CSS) - rust-lang#104666 (Migrate alias search result to CSS variables) - rust-lang#104674 (Make negative_impl and negative_impl_exists take the right types) - rust-lang#104692 (Update test's cfg-if dependency to 1.0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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 free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 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:
include_bytesin pattern position #104416 (Fix usinginclude_bytesin pattern position)MacArgsin two. #104559 (SplitMacArgsin two.)need_migrate_deref_output_trait_object#104597 (Probe + better error messsage forneed_migrate_deref_output_trait_object)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup