Skip to content

Commit 7654a82

Browse files
committed
---
yaml --- r: 181695 b: refs/heads/snap-stage3 c: df76442 h: refs/heads/master i: 181693: 3f9e6ac 181691: 86dda13 181687: bc94416 181679: 2956c12 181663: 9de782f 181631: 8801eab v: v3
1 parent 5a53b62 commit 7654a82

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6c065fc8cb036785f61ff03e05c1563cbb2dd081
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 6f2a1c946744dd6c1de7a1c556cb1333592dec62
4+
refs/heads/snap-stage3: df76442c99635e176f70d2e7977317a871b8f906
55
refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/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)