Commit the changes that rustfmt made to all the listings

listings/ch02-guessing-game-tutorial/listing-02-01/src/main.rs

@@ -1,14 +1,31 @@
+// ANCHOR: all
+// ANCHOR: io
 use std::io;
+// ANCHOR_END: io
 
+// ANCHOR: main
 fn main() {
+    // ANCHOR_END: main
+    // ANCHOR: print
     println!("Guess the number!");
 
     println!("Please input your guess.");
+    // ANCHOR_END: print
 
+    // ANCHOR: string
     let mut guess = String::new();
+    // ANCHOR_END: string
 
-    io::stdin().read_line(&mut guess)
+    // ANCHOR: read
+    io::stdin()
+        .read_line(&mut guess)
+        // ANCHOR_END: read
+        // ANCHOR: expect
         .expect("Failed to read line");
+    // ANCHOR_END: expect
 
+    // ANCHOR: print_guess
     println!("You guessed: {}", guess);
+    // ANCHOR_END: print_guess
 }
+// ANCHOR: all

listings/ch02-guessing-game-tutorial/listing-02-02/src/main.rs

@@ -7,7 +7,8 @@ fn main() {
 
     let mut guess = String::new();
 
-    io::stdin().read_line(&mut guess)
+    io::stdin()
+        .read_line(&mut guess)
         .expect("Failed to read line");
 
     println!("You guessed: {}", guess);

listings/ch02-guessing-game-tutorial/listing-02-03/src/main.rs

@@ -17,7 +17,8 @@ fn main() {
 
     let mut guess = String::new();
 
-    io::stdin().read_line(&mut guess)
+    io::stdin()
+        .read_line(&mut guess)
         .expect("Failed to read line");
 
     println!("You guessed: {}", guess);

listings/ch02-guessing-game-tutorial/listing-02-04/src/main.rs

@@ -1,10 +1,9 @@
 // ANCHOR: here
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
-
     // --snip--
     // ANCHOR_END: here
     println!("Guess the number!");
@@ -17,7 +16,8 @@ fn main() {
 
     let mut guess = String::new();
 
-    io::stdin().read_line(&mut guess)
+    io::stdin()
+        .read_line(&mut guess)
         .expect("Failed to read line");
     // ANCHOR: here
 

listings/ch02-guessing-game-tutorial/listing-02-05/src/main.rs

@@ -1,6 +1,6 @@
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
     println!("Guess the number!");
@@ -17,7 +17,8 @@ fn main() {
         // ANCHOR: here
         // --snip--
 
-        io::stdin().read_line(&mut guess)
+        io::stdin()
+            .read_line(&mut guess)
             .expect("Failed to read line");
 
         // ANCHOR: ch19

listings/ch02-guessing-game-tutorial/listing-02-06/src/main.rs

@@ -1,6 +1,6 @@
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
     println!("Guess the number!");
@@ -12,7 +12,8 @@ fn main() {
 
         let mut guess = String::new();
 
-        io::stdin().read_line(&mut guess)
+        io::stdin()
+            .read_line(&mut guess)
             .expect("Failed to read line");
 
         let guess: u32 = match guess.trim().parse() {

listings/ch02-guessing-game-tutorial/no-listing-03-convert-string-to-number/src/main.rs

@@ -1,6 +1,6 @@
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
     println!("Guess the number!");
@@ -16,11 +16,11 @@ fn main() {
 
     let mut guess = String::new();
 
-    io::stdin().read_line(&mut guess)
+    io::stdin()
+        .read_line(&mut guess)
         .expect("Failed to read line");
 
-    let guess: u32 = guess.trim().parse()
-        .expect("Please type a number!");
+    let guess: u32 = guess.trim().parse().expect("Please type a number!");
 
     println!("You guessed: {}", guess);
 

listings/ch02-guessing-game-tutorial/no-listing-04-looping/src/main.rs

@@ -1,6 +1,6 @@
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
     println!("Guess the number!");
@@ -21,11 +21,11 @@ fn main() {
 
         let mut guess = String::new();
 
-        io::stdin().read_line(&mut guess)
+        io::stdin()
+            .read_line(&mut guess)
             .expect("Failed to read line");
 
-        let guess: u32 = guess.trim().parse()
-            .expect("Please type a number!");
+        let guess: u32 = guess.trim().parse().expect("Please type a number!");
 
         println!("You guessed: {}", guess);
 
@@ -37,4 +37,4 @@ fn main() {
         }
     }
 }
-// ANCHOR_END: here
+// ANCHOR_END: here

listings/ch02-guessing-game-tutorial/no-listing-05-quitting/src/main.rs

@@ -1,6 +1,6 @@
-use std::io;
-use std::cmp::Ordering;
 use rand::Rng;
+use std::cmp::Ordering;
+use std::io;
 
 fn main() {
     println!("Guess the number!");
@@ -14,11 +14,11 @@ fn main() {
 
         let mut guess = String::new();
 
-        io::stdin().read_line(&mut guess)
+        io::stdin()
+            .read_line(&mut guess)
             .expect("Failed to read line");
 
-        let guess: u32 = guess.trim().parse()
-            .expect("Please type a number!");
+        let guess: u32 = guess.trim().parse().expect("Please type a number!");
 
         println!("You guessed: {}", guess);
 

listings/ch03-common-programming-concepts/listing-03-02/src/main.rs

@@ -1,10 +1,6 @@
 fn main() {
     let condition = true;
-    let number = if condition {
-        5
-    } else {
-        6
-    };
+    let number = if condition { 5 } else { 6 };
 
     println!("The value of number is: {}", number);
 }

listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/output.txt

@@ -1,17 +1,12 @@
 $ cargo run
    Compiling branches v0.1.0 (file:///projects/branches)
 error[E0308]: if and else have incompatible types
- --> src/main.rs:7:9
+ --> src/main.rs:4:44
   |
-4 |       let number = if condition {
-  |  __________________-
-5 | |         5
-  | |         - expected because of this
-6 | |     } else {
-7 | |         "six"
-  | |         ^^^^^ expected integer, found &str
-8 | |     };
-  | |_____- if and else have incompatible types
+4 |     let number = if condition { 5 } else { "six" };
+  |                                 -          ^^^^^ expected integer, found &str
+  |                                 |
+  |                                 expected because of this
   |
   = note: expected type `{integer}`
              found type `&str`

listings/ch03-common-programming-concepts/no-listing-31-arms-must-return-same-type/src/main.rs

@@ -1,11 +1,7 @@
 fn main() {
     let condition = true;
 
-    let number = if condition {
-        5
-    } else {
-        "six"
-    };
+    let number = if condition { 5 } else { "six" };
 
     println!("The value of number is: {}", number);
 }

listings/ch04-understanding-ownership/listing-04-07/src/main.rs

@@ -18,5 +18,4 @@ fn first_word(s: &String) -> usize {
 }
 // ANCHOR_END: here
 
-fn main() {
-}
+fn main() {}

listings/ch04-understanding-ownership/no-listing-01-can-mutate-string/src/main.rs

@@ -5,5 +5,5 @@ fn main() {
     s.push_str(", world!"); // push_str() appends a literal to a String
 
     println!("{}", s); // This will print `hello, world!`
-    // ANCHOR_END: here
+                       // ANCHOR_END: here
 }

listings/ch04-understanding-ownership/no-listing-11-muts-in-separate-scopes/src/main.rs

@@ -4,7 +4,6 @@ fn main() {
 
     {
         let r1 = &mut s;
-
     } // r1 goes out of scope here, so we can make a new reference with no problems.
 
     let r2 = &mut s;

listings/ch04-understanding-ownership/no-listing-18-first-word-slice/src/main.rs

@@ -12,5 +12,4 @@ fn first_word(s: &String) -> &str {
 }
 // ANCHOR_END: here
 
-fn main() {
-}
+fn main() {}

listings/ch05-using-structs-to-structure-related-data/listing-05-01/src/main.rs

@@ -7,5 +7,4 @@ struct User {
 }
 // ANCHOR_END: here
 
-fn main() {
-}
+fn main() {}

listings/ch05-using-structs-to-structure-related-data/listing-05-03/src/main.rs

@@ -16,4 +16,4 @@ fn main() {
 
     user1.email = String::from("anotheremail@example.com");
     // ANCHOR_END: here
-}
+}

listings/ch05-using-structs-to-structure-related-data/listing-05-04/src/main.rs

@@ -17,5 +17,8 @@ fn build_user(email: String, username: String) -> User {
 // ANCHOR_END: here
 
 fn main() {
-    let user1 = build_user(String::from("someone@example.com"), String::from("someusername123"));
-}
+    let user1 = build_user(
+        String::from("someone@example.com"),
+        String::from("someusername123"),
+    );
+}

listings/ch05-using-structs-to-structure-related-data/listing-05-05/src/main.rs

@@ -17,5 +17,8 @@ fn build_user(email: String, username: String) -> User {
 // ANCHOR_END: here
 
 fn main() {
-    let user1 = build_user(String::from("someone@example.com"), String::from("someusername123"));
-}
+    let user1 = build_user(
+        String::from("someone@example.com"),
+        String::from("someusername123"),
+    );
+}

listings/ch05-using-structs-to-structure-related-data/listing-05-10/src/main.rs

@@ -4,7 +4,10 @@ struct Rectangle {
 }
 
 fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
 
     println!(
         "The area of the rectangle is {} square pixels.",

listings/ch05-using-structs-to-structure-related-data/listing-05-11/output.txt

@@ -1,14 +1,14 @@
 $ cargo run
    Compiling structs v0.1.0 (file:///projects/structs)
 error[E0277]: `Rectangle` doesn't implement `std::fmt::Display`
- --> src/main.rs:9:29
-  |
-9 |     println!("rect1 is {}", rect1);
-  |                             ^^^^^ `Rectangle` cannot be formatted with the default formatter
-  |
-  = help: the trait `std::fmt::Display` is not implemented for `Rectangle`
-  = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
-  = note: required by `std::fmt::Display::fmt`
+  --> src/main.rs:12:29
+   |
+12 |     println!("rect1 is {}", rect1);
+   |                             ^^^^^ `Rectangle` cannot be formatted with the default formatter
+   |
+   = help: the trait `std::fmt::Display` is not implemented for `Rectangle`
+   = note: in format strings you may be able to use `{:?}` (or {:#?} for pretty-print) instead
+   = note: required by `std::fmt::Display::fmt`
 
 error: aborting due to previous error
 

listings/ch05-using-structs-to-structure-related-data/listing-05-11/src/main.rs

@@ -4,7 +4,10 @@ struct Rectangle {
 }
 
 fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
 
     println!("rect1 is {}", rect1);
 }

listings/ch05-using-structs-to-structure-related-data/listing-05-12/src/main.rs

@@ -5,7 +5,10 @@ struct Rectangle {
 }
 
 fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
 
     println!("rect1 is {:?}", rect1);
 }

listings/ch05-using-structs-to-structure-related-data/listing-05-13/src/main.rs

@@ -11,7 +11,10 @@ impl Rectangle {
 }
 
 fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
 
     println!(
         "The area of the rectangle is {} square pixels.",

listings/ch05-using-structs-to-structure-related-data/listing-05-14/src/main.rs

@@ -1,7 +1,16 @@
 fn main() {
-    let rect1 = Rectangle { width: 30, height: 50 };
-    let rect2 = Rectangle { width: 10, height: 40 };
-    let rect3 = Rectangle { width: 60, height: 45 };
+    let rect1 = Rectangle {
+        width: 30,
+        height: 50,
+    };
+    let rect2 = Rectangle {
+        width: 10,
+        height: 40,
+    };
+    let rect3 = Rectangle {
+        width: 60,
+        height: 45,
+    };
 
     println!("Can rect1 hold rect2? {}", rect1.can_hold(&rect2));
     println!("Can rect1 hold rect3? {}", rect1.can_hold(&rect3));