Skip to content

Commit 1e01dd4

Browse files
committed
---
yaml --- r: 184273 b: refs/heads/tmp c: df76442 h: refs/heads/master i: 184271: 84f1238 v: v3
1 parent 1537dea commit 1e01dd4

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
37+
refs/heads/tmp: df76442c99635e176f70d2e7977317a871b8f906

branches/tmp/src/libstd/old_io/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ use error::Error;
252252
use fmt;
253253
use isize;
254254
use iter::{Iterator, IteratorExt};
255-
use marker::Sized;
255+
use marker::{PhantomFn, Sized};
256256
use mem::transmute;
257257
use ops::FnOnce;
258258
use option::Option;
@@ -1572,7 +1572,9 @@ pub trait Seek {
15721572
/// connections.
15731573
///
15741574
/// Doing so produces some sort of Acceptor.
1575-
pub trait Listener<T, A: Acceptor<T>> {
1575+
pub trait Listener<T, A: Acceptor<T>>
1576+
: PhantomFn<T,T> // FIXME should be an assoc type anyhow
1577+
{
15761578
/// Spin up the listener and start queuing incoming connections
15771579
///
15781580
/// # Error

0 commit comments

Comments
 (0)