Skip to content

Commit b12ff77

Browse files
committed
---
yaml --- r: 72159 b: refs/heads/dist-snap c: 6a5c4f6 h: refs/heads/master i: 72157: 0a044e9 72155: f32e0f2 72151: c6888c3 72143: 093c074 72127: 2c1ed41 v: v3
1 parent 5433e9e commit b12ff77

File tree

30 files changed

+1929
-428
lines changed

30 files changed

+1929
-428
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: 69f6ac5d31fbd2a4bcf104a818e79d6e4e34c8f7
10+
refs/heads/dist-snap: 6a5c4f68c2f8c10bf439a39373f5c518ed2f58a1
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ do spawn {
16701670
~~~~
16711671

16721672
If you want to see the output of `debug!` statements, you will need to turn on `debug!` logging.
1673-
To enable `debug!` logging, set the RUST_LOG environment variable to the name of your crate, which, for a file named `foo.rs`, will be `foo` (e.g., with bash, `export RUST_LOG=foo`).
1673+
To enable `debug!` logging, set the RUST_LOG environment variable to `debug` (e.g., with bash, `export RUST_LOG=debug`)
16741674

16751675
## For loops
16761676

branches/dist-snap/src/etc/x86.supp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@
583583
{
584584
llvm-optimization-reads-uninitialized-memory-3
585585
Memcheck:Cond
586-
fun:_ZN4test9run_tests*
586+
fun:_ZN4test9run_tests4anon13expr_fn_*
587587
...
588588
}
589589

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use prelude::*;
12+
use super::{Reader, Writer};
13+
14+
struct PortReader<P>;
15+
16+
impl<P: GenericPort<~[u8]>> PortReader<P> {
17+
pub fn new(_port: P) -> PortReader<P> { fail!() }
18+
}
19+
20+
impl<P: GenericPort<~[u8]>> Reader for PortReader<P> {
21+
fn read(&mut self, _buf: &mut [u8]) -> Option<uint> { fail!() }
22+
23+
fn eof(&mut self) -> bool { fail!() }
24+
}
25+
26+
struct ChanWriter<C>;
27+
28+
impl<C: GenericChan<~[u8]>> ChanWriter<C> {
29+
pub fn new(_chan: C) -> ChanWriter<C> { fail!() }
30+
}
31+
32+
impl<C: GenericChan<~[u8]>> Writer for ChanWriter<C> {
33+
pub fn write(&mut self, _buf: &[u8]) { fail!() }
34+
35+
pub fn flush(&mut self) { fail!() }
36+
}
37+
38+
struct ReaderPort<R>;
39+
40+
impl<R: Reader> ReaderPort<R> {
41+
pub fn new(_reader: R) -> ReaderPort<R> { fail!() }
42+
}
43+
44+
impl<R: Reader> GenericPort<~[u8]> for ReaderPort<R> {
45+
fn recv(&self) -> ~[u8] { fail!() }
46+
47+
fn try_recv(&self) -> Option<~[u8]> { fail!() }
48+
}
49+
50+
struct WriterChan<W>;
51+
52+
impl<W: Writer> WriterChan<W> {
53+
pub fn new(_writer: W) -> WriterChan<W> { fail!() }
54+
}
55+
56+
impl<W: Writer> GenericChan<~[u8]> for WriterChan<W> {
57+
fn send(&self, _x: ~[u8]) { fail!() }
58+
}
59+

0 commit comments

Comments
 (0)