Skip to content

Commit f7e7079

Browse files
committed
---
yaml --- r: 139127 b: refs/heads/try2 c: 9350d14 h: refs/heads/master i: 139125: 3d14cda 139123: d426ab0 139119: 8cdfc83 v: v3
1 parent 3bb22cf commit f7e7079

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: bb9e1e2660990012c35ee975530b0b8b3136baf0
8+
refs/heads/try2: 9350d14ecb025f963198e9baa39679f808496785
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/comm.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ pub fn stream<T:Owned>() -> (Port<T>, Chan<T>) {
110110
// required.
111111
#[cfg(stage1)]
112112
#[cfg(stage2)]
113+
#[cfg(stage3)]
113114
pub impl<T: Owned> Chan<T> {
114115
fn send(&self, x: T) { chan_send(self, x) }
115116
fn try_send(&self, x: T) -> bool { chan_try_send(self, x) }
@@ -149,6 +150,7 @@ fn chan_try_send<T:Owned>(self: &Chan<T>, x: T) -> bool {
149150
// Use an inherent impl so that imports are not required:
150151
#[cfg(stage1)]
151152
#[cfg(stage2)]
153+
#[cfg(stage3)]
152154
pub impl<T: Owned> Port<T> {
153155
fn recv(&self) -> T { port_recv(self) }
154156
fn try_recv(&self) -> Option<T> { port_try_recv(self) }
@@ -226,6 +228,7 @@ pub fn PortSet<T: Owned>() -> PortSet<T>{
226228
// Use an inherent impl so that imports are not required:
227229
#[cfg(stage1)]
228230
#[cfg(stage2)]
231+
#[cfg(stage3)]
229232
pub impl<T:Owned> PortSet<T> {
230233
fn recv(&self) -> T { port_set_recv(self) }
231234
fn try_recv(&self) -> Option<T> { port_set_try_recv(self) }
@@ -301,6 +304,7 @@ pub type SharedChan<T> = unstable::Exclusive<Chan<T>>;
301304
302305
#[cfg(stage1)]
303306
#[cfg(stage2)]
307+
#[cfg(stage3)]
304308
pub impl<T: Owned> SharedChan<T> {
305309
fn send(&self, x: T) { shared_chan_send(self, x) }
306310
fn try_send(&self, x: T) -> bool { shared_chan_try_send(self, x) }

branches/try2/src/libcore/io.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ pub trait Reader {
7777

7878
#[cfg(stage1)]
7979
#[cfg(stage2)]
80+
#[cfg(stage3)]
8081
impl Reader for @Reader {
8182
fn read(&self, bytes: &mut [u8], len: uint) -> uint {
8283
self.read(bytes, len)
@@ -659,6 +660,7 @@ pub trait Writer {
659660
660661
#[cfg(stage1)]
661662
#[cfg(stage2)]
663+
#[cfg(stage3)]
662664
impl Writer for @Writer {
663665
fn write(&self, v: &[const u8]) { self.write(v) }
664666
fn seek(&self, a: int, b: SeekStyle) { self.seek(a, b) }

branches/try2/src/librustc/front/test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ fn mk_tests(cx: &TestCtxt) -> @ast::item {
369369

370370
#[cfg(stage1)]
371371
#[cfg(stage2)]
372+
#[cfg(stage3)]
372373
fn mk_tests(cx: &TestCtxt) -> @ast::item {
373374

374375
let ext_cx = cx.ext_cx;

branches/try2/src/libstd/comm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ pub struct DuplexStream<T, U> {
2828
// Allow these methods to be used without import:
2929
#[cfg(stage1)]
3030
#[cfg(stage2)]
31+
#[cfg(stage3)]
3132
pub impl<T:Owned,U:Owned> DuplexStream<T, U> {
3233
fn send(&self, x: T) {
3334
self.chan.send(x)

0 commit comments

Comments
 (0)