Rollup of 6 pull requests #61460
Merged
Rollup of 6 pull requests #61460
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
This changes a mistake introduced in rust-lang#61195 where the mangling workaround used was incorrect.
A semicolon is missing in the examples of compile_error. Macros that expand to items must be delimited with braces or followed by a semicolon.
…eddyb Fix some issues with `unwrap_usize` instead of `assert_usize` Fixes rust-lang#61337. Fixes rust-lang#61341. Fixes rust-lang#61422. r? @eddyb
…r=eddyb codegen: change `$6d$` to `$u6d$` This changes a mistake introduced in rust-lang#61195 where the mangling workaround used was incorrect, resolving [this comment](rust-lang#61195 (comment)) from @eddyb. r? @eddyb
Point at individual type args on arg count mismatch - Point at individual type arguments on arg count mismatch - Make generics always have a valid span, even when there are no args - Explain that `impl Trait` introduces an implicit type argument Fix rust-lang#55991.
Tweak wording when encountering `fn` call in pattern Fix rust-lang#60642
Fix missing semicolon in doc A semicolon is missing in the examples of compile_error. Macros that expand to items must be delimited with braces or followed by a semicolon.
…hievink Fix typo in AsRef doc
|
@bors r+ p=6 rollup=never |
|
📌 Commit aaf264b has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jun 2, 2019
Rollup of 6 pull requests Successful merges: - #61380 (Fix some issues with `unwrap_usize` instead of `assert_usize`) - #61423 (codegen: change `$6d$` to `$u6d$`) - #61438 (Point at individual type args on arg count mismatch) - #61441 (Tweak wording when encountering `fn` call in pattern) - #61451 (Fix missing semicolon in doc) - #61458 (Fix typo in AsRef doc) Failed merges: r? @ghost
|
☀️ Test successful - checks-travis, status-appveyor |
This was referenced Jun 2, 2019
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:
unwrap_usizeinstead ofassert_usize#61380 (Fix some issues withunwrap_usizeinstead ofassert_usize)$6d$to$u6d$#61423 (codegen: change$6d$to$u6d$)fncall in pattern #61441 (Tweak wording when encounteringfncall in pattern)Failed merges:
r? @ghost