about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-02-19 14:12:37 -0800
committerbors <bors@rust-lang.org>2013-02-19 14:12:37 -0800
commit8a520ff99fb2fe8e289d940dde27b7df645d6b3a (patch)
treeff10eb1a639d3b18d6137d5446d74c71af4d8dc6
parent1f956fc3b2ad6f1b8db3d580a409fb5636c8297f (diff)
parente8732bde5ebc29ea69cc7d2c1637490d26424b2d (diff)
downloadrust-8a520ff99fb2fe8e289d940dde27b7df645d6b3a.tar.gz
rust-8a520ff99fb2fe8e289d940dde27b7df645d6b3a.zip
auto merge of #5000 : jld/rust/test-stdin-thing, r=graydon
As far as I can tell, the only reason run-pass/type-use-i1-versus-i8
is trying to do a read is because that code was left over from the
original program the issue was found in.  When that test is run as
part of check-fast, and apparently only in that case, the test blocks
indefinitely, which is bad.
-rw-r--r--src/test/run-pass/type-use-i1-versus-i8.rs8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/run-pass/type-use-i1-versus-i8.rs
index 5f0414cdb78..5f3c60c9ba5 100644
--- a/src/test/run-pass/type-use-i1-versus-i8.rs
+++ b/src/test/run-pass/type-use-i1-versus-i8.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,14 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use io::ReaderUtil;
 pub fn main() {
     let mut x: bool = false;
     // this line breaks it
     vec::rusti::move_val_init(&mut x, false);
-
-    let input = io::stdin();
-    let line = input.read_line(); // use core's io again
-
-    io::println(fmt!("got %?", line));
 }