Skip to content

Rollup of 5 pull requests #23727

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
Closed
erickt wants to merge 11 commits into from
Closed

Rollup of 5 pull requests #23727

erickt wants to merge 11 commits into from

Conversation

@erickt
Copy link
Contributor

@erickt erickt commented Mar 26, 2015

erickt and others added 11 commits March 24, 2015 14:26
@erickt
test: silence a warning
d4701bd
@erickt
syntax: Update #[derive(...)] to work with phantom and associated types
9cabe27 
Closes rust-lang#7671, rust-lang#19839
@wettowelreactor
Update pointers.md
053d58e
@erickt
Speed up reading/writing slices with #[inline]
92e72ee 
When built with `rustc -O`:

before:

test bench_read_slice  ... bench:        68 ns/iter (+/- 56)
test bench_read_vec    ... bench:        78 ns/iter (+/- 21)
test bench_write_slice ... bench:       133 ns/iter (+/- 46)
test bench_write_vec   ... bench:       308 ns/iter (+/- 69)

after:

test bench_read_slice  ... bench:        32 ns/iter (+/- 10)
test bench_read_vec    ... bench:        32 ns/iter (+/- 8)
test bench_write_slice ... bench:        53 ns/iter (+/- 12)
test bench_write_vec   ... bench:       247 ns/iter (+/- 172)
@alexcrichton
std: Add net::IpAddr, destabilize lookup_host
8165bc1 
This commits adds back an `IpAddr` enum matching the `SocketAddr` enum, but
without a port. The enumeration is `#[unstable]`. The `lookup_host` function and
iterator are also destabilized behind a new feature gate due to questions around
the semantics of returning `SocketAddr` values.
@erickt
Deprecate as_mut_slice methods
5ed703b 
This is technically a breaking change as it deprecates and unstables
some previously stable apis that were missed in the last round of
deprecations.

[breaking change]
@erickt
Rollup merge of rust-lang#21237 - erickt:derive-assoc-types, r=erickt
97ff51d 
This PR adds support for associated types to the `#[derive(...)]` syntax extension. In order to do this, it switches over to using where predicates to apply the type constraints. So now this:

```rust
type Trait {
    type Type;
}

#[derive(Clone)]
struct Foo<A> where A: Trait {
    a: A,
    b: <A as Trait>::Type,
}
```

Gets expended into this impl:

```rust
impl<A: Clone> Clone for Foo<A> where
    A: Trait,
    <A as Trait>::Type: Clone,
{
    fn clone(&self) -> Foo<T> {
        Foo {
            a: self.a.clone(),
            b: self.b.clone(),
        }
    }
}
```
@erickt
Rollup merge of rust-lang#23680 - erickt:inline, r=cmr
d5568c0 
before:

test bench_read_slice  ... bench:        68 ns/iter (+/- 56)
test bench_read_vec    ... bench:        78 ns/iter (+/- 21)
test bench_write_slice ... bench:       133 ns/iter (+/- 46)
test bench_write_vec   ... bench:       308 ns/iter (+/- 69)

after:

test bench_read_slice  ... bench:        32 ns/iter (+/- 10)
test bench_read_vec    ... bench:        32 ns/iter (+/- 8)
test bench_write_slice ... bench:        53 ns/iter (+/- 12)
test bench_write_vec   ... bench:       247 ns/iter (+/- 172)
@erickt
Rollup merge of rust-lang#23690 - wettowelreactor:patch-1, r=stevekla…
20ce4e6 
…bnik
@erickt
Rollup merge of rust-lang#23711 - alexcrichton:ip-addr, r=aturon
20ee8b4 
This commits adds back an `IpAddr` enum matching the `SocketAddr` enum, but
without a port. The enumeration is `#[unstable]`. The `lookup_host` function and
iterator are also destabilized behind a new feature gate due to questions around
the semantics of returning `SocketAddr` values.
@erickt
Rollup merge of rust-lang#23721 - erickt:deprecate, r=alexcrichton
1dbcb5c 
This is technically a breaking change as it deprecates and unstables some previously stable apis that were missed in the last round of deprecations.

[breaking change]
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 26, 2015

r? @huonw

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

@erickt
Copy link
Contributor Author

erickt commented Mar 26, 2015

@bors: r+ p=21

@bors
Copy link
Collaborator

bors commented Mar 26, 2015

📌 Commit 1dbcb5c has been approved by erickt

@Manishearth Manishearth mentioned this pull request Mar 26, 2015
Closed
@bors
Copy link
Collaborator

bors commented Mar 26, 2015

⌛ Testing commit 1dbcb5c with merge a2d93b8...

@bors
Copy link
Collaborator

bors commented Mar 26, 2015

💔 Test failed - auto-mac-64-nopt-t

@Manishearth
Copy link
Member

Manishearth commented Mar 26, 2015 

error: aborting due to previous error
thread 'distributions::WeightedChoice_0' panicked at 'Box<Any>', /Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libsyntax/diagnostic.rs:152



failures:
    distributions::WeightedChoice_0

@alexcrichton
Copy link
Member

alexcrichton commented Mar 27, 2015

Closing in favor of #23796, but thanks!

@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

@huonw huonw

Labels

rollup A PR which is a rollup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@erickt @rust-highfive @bors @Manishearth @alexcrichton @Centril @huonw @wettowelreactor