Skip to content

Rollup of PRs in the queue; Thursday #23502

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.

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

Merged
merged 30 commits into from
Mar 19, 2015
Merged

Rollup of PRs in the queue; Thursday #23502

merged 30 commits into from
Mar 19, 2015

Conversation

Manishearth
Copy link
Member

No description provided.

alexcrichton and others added 8 commits March 17, 2015 18:05
This commit stabilizes the `cloned` iterator after tweaking the signature to
require that the iterator is over `&T` instead of `U: Deref<T>`. This method has
had time to bake for awhile now and it's not clear whether the `Deref` bound is
worth it. Additionally, there aren't clear conventions on when to bound and/or
implement the `Deref` trait, so for now the conservative route is to require
references instead of `U: Deref<T>`.

To change this signature to using `Deref` would technically be a
backwards-incompatible change, but it is doubtful that any code will actually
break in practice.
Nothing inside of the read/write interface itself can panic, so any
poison must have been the result of user code which the lock isn't
protecting.
- remove `pub` from `struct` (visibility has no effect inside functions)
- move `pthread_main_np` into function
[breaking-change]: instead of a closure like `|| -> i32 22`, prefer `||
-> i32 { 22 }`.

Fixes rust-lang#23420.
@Manishearth
Copy link
Member Author

@bors: r+ p=10

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit 744cbc1 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 744cbc1 with merge 365f280...

Manishearth and others added 10 commits March 19, 2015 08:24
…chton

 Hopefully didn’t miss or mess up anything.

~~EDIT: ah, as usual, just didn’t bother running build before pushing a submit request button. Build pending.~~
…uron

 This commit stabilizes the `cloned` iterator after tweaking the signature to
require that the iterator is over `&T` instead of `U: Deref<T>`. This method has
had time to bake for awhile now and it's not clear whether the `Deref` bound is
worth it. Additionally, there aren't clear conventions on when to bound and/or
implement the `Deref` trait, so for now the conservative route is to require
references instead of `U: Deref<T>`.

To change this signature to using `Deref` would technically be a
backwards-incompatible change, but it is doubtful that any code will actually
break in practice.
 Nothing inside of the read/write interface itself can panic, so any
poison must have been the result of user code which the lock isn't
protecting.

This seems safe to me, but if we don't want to go this route we should update the docs to indicate that these methods can panic.

r? @alexcrichton
This is a significant performance problem in Servo.
@bors
Copy link
Collaborator

bors commented Mar 19, 2015

💔 Test failed - auto-win-32-opt

@Manishearth
Copy link
Member Author

@bors: r+ force

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit 5f5bc4c has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 5f5bc4c with merge bfa28c7...

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

💔 Test failed - auto-win-32-opt

@Manishearth
Copy link
Member Author

@bors: r+ force

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

📌 Commit 6f930b9 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 6f930b9 with merge 0084f92...

…acrichto

 Require braces when a closure has an explicit return type. This is a [breaking-change]: instead of a closure like `|| -> i32 22`, prefer `|| -> i32 { 22 }`.

Fixes rust-lang#23420.
…hton

 unbreak openbsd/bitrig build
- remove `pub` from `struct` (error: visibility has no effect inside functions)
- move `pthread_main_np` into function

r? @alexcrichton
 This is a significant performance problem in Servo.

r? @brson
 Fixes rust-lang#22309

I am pretty sure that this is the right way to do this, given the other macros, but I'm not 100% sure.
 I often have to run `ast-json` or look into the pretty-printer source to figure out what the fields of an AST enum mean. I've tried to document most of what I know (and some semi-obvious stuff).

r? @steveklabnik

f? @eddyb
@bors
Copy link
Collaborator

bors commented Mar 19, 2015

@bors bors merged commit 6f930b9 into rust-lang:master Mar 19, 2015
@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
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.