projects
/
rust-101.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
77f9c2a
)
EOF is Ctrl-Z on windows
author
Ralf Jung
<post@ralfj.de>
Thu, 3 Sep 2015 01:25:08 +0000
(
03:25
+0200)
committer
Ralf Jung
<post@ralfj.de>
Thu, 3 Sep 2015 01:25:08 +0000
(
03:25
+0200)
src/part03.rs
patch
|
blob
|
history
workspace/src/part03.rs
patch
|
blob
|
history
diff --git
a/src/part03.rs
b/src/part03.rs
index 548b08235100b4f2bce7bbc3b003f3e9cb8a9983..513148b9147265068c8fe78c95b4d079a206e685 100644
(file)
--- a/
src/part03.rs
+++ b/
src/part03.rs
@@
-24,7
+24,7
@@
fn read_vec() -> Vec<i32> {
let mut vec: Vec<i32> = Vec::<i32>::new();
// The central handle to the standard input is made available by the function `io::stdin`.
let stdin = io::stdin();
let mut vec: Vec<i32> = Vec::<i32>::new();
// The central handle to the standard input is made available by the function `io::stdin`.
let stdin = io::stdin();
- println!("Enter a list of numbers, one per line. End with Ctrl-D.");
+ println!("Enter a list of numbers, one per line. End with Ctrl-D
(Linux) or Ctrl-Z (Windows)
.");
//@ We would now like to iterate over standard input line-by-line. We can use a `for` loop
//@ for that, but there is a catch: What happens if there is some other piece of code running
//@ concurrently, that also reads from standard input? The result would be a mess. Hence
//@ We would now like to iterate over standard input line-by-line. We can use a `for` loop
//@ for that, but there is a catch: What happens if there is some other piece of code running
//@ concurrently, that also reads from standard input? The result would be a mess. Hence
diff --git
a/workspace/src/part03.rs
b/workspace/src/part03.rs
index 152b5258a89fe513f6fe3e2d6d2ded2c31fee397..e3f16aea0d746d0ace460a7afa8daea2484df89a 100644
(file)
--- a/
workspace/src/part03.rs
+++ b/
workspace/src/part03.rs
@@
-12,7
+12,7
@@
fn read_vec() -> Vec<i32> {
let mut vec: Vec<i32> = Vec::<i32>::new();
// The central handle to the standard input is made available by the function `io::stdin`.
let stdin = io::stdin();
let mut vec: Vec<i32> = Vec::<i32>::new();
// The central handle to the standard input is made available by the function `io::stdin`.
let stdin = io::stdin();
- println!("Enter a list of numbers, one per line. End with Ctrl-D.");
+ println!("Enter a list of numbers, one per line. End with Ctrl-D
(Linux) or Ctrl-Z (Windows)
.");
for line in stdin.lock().lines() {
// Rust's type for (dynamic, growable) strings is `String`. However, our variable `line`
// here is not yet of that type: It has type `io::Result<String>`.
for line in stdin.lock().lines() {
// Rust's type for (dynamic, growable) strings is `String`. However, our variable `line`
// here is not yet of that type: It has type `io::Result<String>`.