Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #61290
Closed
Centril wants to merge 32 commits into
Closed
Conversation
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
…eddyb Allow const parameters in array sizes to be unified Fixesrust-lang#60632. Fixesrust-lang#60744. Fixesrust-lang#60923. (The last commit should probably be viewed in isolation, as it just renames things from `type` to `kind`.) r? @eddyb
…s, r=nikomatsakis Add better tests for hidden lifetimes in impl trait cc rust-lang#60670
tests: Centralize proc macros commonly used for testing Many proc macros in `ui\proc-macro\auxiliary` were doing same things. (I added a fair share of those myself.) Now commonly used macros (empty, identity, etc) are collected in one place - `ui\proc-macro\auxiliary\test-macros.rs`.
…a-discard_buffer, r=nikomatsakis BufReader: In Seek impl, remove extra discard_buffer call As far as I can tell, this code does nothing. I'm not sure why it even is there.
…atsakis Mailmap fixes I've made a few fixes and additions to the .mailmap file. - I've added my information to it, as I noticed it was popping up twice at the [Thanks](https://thanks.rust-lang.org/rust/all-time/) website (I've made contributions to the Rust Book). - I noticed that @carols10cents‘ information was popping up in multiple places at the [Thanks](https://thanks.rust-lang.org/rust/all-time/) website and when running `git shortlog -s -e > out.txt`, and fixed her information - I alphabetized the list using Atom's [Sort Lines package](https://github.com/atom/sort-lines) The output from before and after running `git shortlog -s -e > out.txt` for Carol: <img width="708" alt="Carol Before" src="https://user-images.githubusercontent.com/19867440/58472843-2d8ca880-8115-11e9-9624-d31ed23ae9b5.png"> <img width="523" alt="Carol After" src="https://user-images.githubusercontent.com/19867440/58472844-2d8ca880-8115-11e9-95c6-80b17cc04790.png"> The output from before and after running `git shortlog -s -e > out.txt` for myself: <img width="489" alt="Joseph After" src="https://user-images.githubusercontent.com/19867440/58472941-6e84bd00-8115-11e9-8266-1d7fcd53d0bc.png"> <img width="421" alt="Joseph Before" src="https://user-images.githubusercontent.com/19867440/58472943-6e84bd00-8115-11e9-9fd2-d7ace7e3d636.png">
mention that MaybeUninit is a bit like Option
Centril
commented
May 28, 2019
ContributorAuthor
@bors r+ rollup=never p=6 |
bors
commented
May 28, 2019
Collaborator
📌 Commit 76b94c5 has been approved by |
Centril
commented
May 28, 2019
ContributorAuthor
@bors r- |
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
8 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:
Failed merges:
r? @ghost