Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 6 pull requests #33758

Merged
merged 15 commits into from
May 21, 2016
Merged

Rollup of 6 pull requests #33758

merged 15 commits into from
May 21, 2016

Conversation

GuillaumeGomez
Copy link
Member

sanxiyn and others added 15 commits May 17, 2016 20:37
@sanxiyn
Preserve span when lowering ExprKind::Paren
0f257df
@sanxiyn
Fix code suggestion in test
bc4c67d
@sanxiyn
Remove unnecessary parens in macro
cdbf015
@sanxiyn
Be smart about span of parenthesized expression in macro
edf1773
@luqmana
[MIR] Add PointerCast for Unsize casts of fat pointers.
94f0918
Reword the short diagnostic for E0509
e575d19 
Saying that a type *implements* a trait is much more idiomatic than saying it *defines* the trait.
@GuillaumeGomez
Add new error code tests
93fb14f
@postmodern
Clarify wording in transmute example
345626f 
* Change "four eights" to "four u8s"
* Change "a 32" to "a u32"
@dns2utf8
Catch thread in example
22615ad 
 - Consume result of thread join()
 - Add link to threading model
@GuillaumeGomez
Rollup merge of rust-lang#33668 - dns2utf8:catch_thread, r=steveklabnik
fda3134 
Catch thread in example

Since this is an example, the code will be copied by many people and should be over correct.

?r @steveklabnik
@GuillaumeGomez
Rollup merge of rust-lang#33676 - rkruppe:e0509-exact-words, r=sanxiyn
f22c5aa 
Reword the short diagnostic for E0509

Saying that a type *implements* a trait is much more idiomatic than saying it *defines* the trait.
@GuillaumeGomez
Rollup merge of rust-lang#33683 - sanxiyn:paren-span, r=nikomatsakis
5dc8dfa 
Preserve span when lowering ExprKind::Paren

Fix rust-lang#33681.
@GuillaumeGomez
Rollup merge of rust-lang#33734 - luqmana:33387-mir_fat_ptr_coerce, r…
4913e88 
…=arielb1

[MIR] Add PointerCast for Unsize casts of fat pointers.

Fixes rust-lang#33387.

r? @eddyb
@GuillaumeGomez
Rollup merge of rust-lang#33739 - GuillaumeGomez:error-code-tests, r=…
c67dae8 
…Manishearth

Add new error code tests

r? @steveklabnik
@GuillaumeGomez
Rollup merge of rust-lang#33745 - postmodern:patch-1, r=steveklabnik
4a3ba87 
Clarify wording in `transmute` example

* Change "four eights" to "four u8s"
* Change "a 32" to "a u32"
@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@GuillaumeGomez
Copy link
Member Author

r? @Manishearth

cc @steveklabnik

@Manishearth
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented May 20, 2016

📌 Commit 4a3ba87 has been approved by Manishearth

@steveklabnik
Copy link
Member

@bors: p=1

@bors
Copy link
Contributor

bors commented May 20, 2016

⌛ Testing commit 4a3ba87 with merge 500e5c1...

bors added a commit that referenced this pull request May 20, 2016
@bors
Auto merge of #33758 - GuillaumeGomez:rollup, r=Manishearth
500e5c1 
Rollup of 6 pull requests

- Successful merges: #33668, #33676, #33683, #33734, #33739, #33745
- Failed merges: #33578
@bors
Copy link
Contributor

bors commented May 21, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit 4a3ba87 into rust-lang:master May 21, 2016
@bors bors mentioned this pull request May 21, 2016
Merged
@GuillaumeGomez GuillaumeGomez deleted the rollup branch May 21, 2016 13:25
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.