main.rs lines shortened

[rust-101.git] / src / part03.rs

diff --git a/src/part03.rs b/src/part03.rs
index 513148b9147265068c8fe78c95b4d079a206e685..81f8714207214c7816dadac369f3e56cd18b6d41 100644 (file)
--- a/src/part03.rs
+++ b/src/part03.rs
@@ -6,7 +6,7 @@
 //@ I/O is a complicated topic, so the code to do that is not exactly pretty - but well,
 //@ let's get that behind us.
 
 //@ I/O is a complicated topic, so the code to do that is not exactly pretty - but well,
 //@ let's get that behind us.
 

-// I/O is provided by the module `std::io`, so we first have import that with `use`.
+// I/O is provided by the module `std::io`, so we first have to import that with `use`.

 // We also import the I/O *prelude*, which makes a bunch of commonly used I/O stuff
 // directly available.
 use std::io::prelude::*;
 // We also import the I/O *prelude*, which makes a bunch of commonly used I/O stuff
 // directly available.
 use std::io::prelude::*;


@@ -51,7 +51,7 @@ fn read_vec() -> Vec<i32> {
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.
         //@ We first `trim` the `line` to remove leading and trailing whitespace.
         let line = line.unwrap();
         // Now that we have our `String`, we want to make it an `i32`.
         //@ We first `trim` the `line` to remove leading and trailing whitespace.

-        //@ `parse` is a method on `String` that can convert a string to anything. Try finding it's documentation!
+        //@ `parse` is a method on `String` that can convert a string to anything. Try finding its documentation!

 
         //@ In this case, Rust *could* figure out automatically that we need an `i32` (because of the return type
         //@ of the function), but that's a bit too much magic for my taste. We are being more explicit here:
 
         //@ In this case, Rust *could* figure out automatically that we need an `i32` (because of the return type
         //@ of the function), but that's a bit too much magic for my taste. We are being more explicit here:


@@ -104,7 +104,7 @@ pub fn main() {
 // Notice that I called the function on `SomethingOrNothing` `print2` to disambiguate from the `print` defined previously.
 // 
 // *Hint*: There is a macro `print!` for printing without appending a newline.
 // Notice that I called the function on `SomethingOrNothing` `print2` to disambiguate from the `print` defined previously.
 // 
 // *Hint*: There is a macro `print!` for printing without appending a newline.

-trait Print {
+pub trait Print {

     /* Add things here */
 }
 impl<T: Print> SomethingOrNothing<T> {
     /* Add things here */
 }
 impl<T: Print> SomethingOrNothing<T> {


@@ -116,4 +116,4 @@ impl<T: Print> SomethingOrNothing<T> {
 // **Exercise 03.2**: Building on exercise 02.2, implement all the things you need on `f32` to make your
 // program work with floating-point numbers.
 
 // **Exercise 03.2**: Building on exercise 02.2, implement all the things you need on `f32` to make your
 // program work with floating-point numbers.
 

-//@ [index](main.html) | [previous](part02.html) | [raw source](https://www.ralfj.de/git/rust-101.git/blob_plain/HEAD:/workspace/src/part03.rs) | [next](part04.html)
+//@ [index](main.html) | [previous](part02.html) | [raw source](workspace/src/part03.rs) | [next](part04.html)