Refactor shell starter templates and solutions

compiled_starters/go/cmd/myshell/main.go

@@ -10,10 +10,9 @@ func main() {
 	// You can use print statements as follows for debugging, they'll be visible when running tests.
 	fmt.Println("Logs from your program will appear here!")
 
-	reader := bufio.NewReader(os.Stdin)
-	for {
-		// Uncomment this block to pass the first stage
-		// fmt.Fprint(os.Stdout, "$ ")
-		_, _ = reader.ReadString('\n')
-	}
+	// Uncomment this block to pass the first stage
+	// fmt.Fprint(os.Stdout, "$ ")
+
+	// Wait for user input
+	bufio.NewReader(os.Stdin).ReadString('\n')
 }

compiled_starters/python/app/main.py

@@ -5,11 +5,12 @@ def main():
     # You can use print statements as follows for debugging, they'll be visible when running tests.
     print("Logs from your program will appear here!")
 
-    while True:
-        # Uncomment this block to pass the first stage
-        # sys.stdout.write("$ ")
-        # sys.stdout.flush()
-        input()
+    # Uncomment this block to pass the first stage
+    # sys.stdout.write("$ ")
+    # sys.stdout.flush()
+
+    # Wait for user input
+    input()
 
 
 if __name__ == "__main__":

compiled_starters/rust/src/main.rs

@@ -1,15 +1,16 @@
+#[allow(unused_imports)]
 use std::io::{self, Write};
 
 fn main() {
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     println!("Logs from your program will appear here!");
 
     // Uncomment this block to pass the first stage
-    // let stdin = io::stdin();
-    // loop {
-    //     print!("$ ");
-    //     io::stdout().flush().unwrap();
-    //     let mut input = String::new();
-    //     stdin.read_line(&mut input).unwrap();
-    // }
+    // print!("$ ");
+    // io::stdout().flush().unwrap();
+
+    // Wait for user input
+    let stdin = io::stdin();
+    let mut input = String::new();
+    stdin.read_line(&mut input).unwrap();
 }

solutions/go/01-oo8/code/cmd/myshell/main.go

@@ -7,9 +7,8 @@ import (
 )
 
 func main() {
-	reader := bufio.NewReader(os.Stdin)
-	for {
-		fmt.Fprint(os.Stdout, "$ ")
-		_, _ = reader.ReadString('\n')
-	}
+	fmt.Fprint(os.Stdout, "$ ")
+
+	// Wait for user input
+	bufio.NewReader(os.Stdin).ReadString('\n')
 }

solutions/go/01-oo8/diff/cmd/myshell/main.go.diff

@@ -1,4 +1,4 @@
-@@ -1,19 +1,15 @@
+@@ -1,18 +1,14 @@
  package main
 
  import (
@@ -11,11 +11,10 @@
 -	// You can use print statements as follows for debugging, they'll be visible when running tests.
 -	fmt.Println("Logs from your program will appear here!")
 -
- 	reader := bufio.NewReader(os.Stdin)
- 	for {
--		// Uncomment this block to pass the first stage
--		// fmt.Fprint(os.Stdout, "$ ")
-+		fmt.Fprint(os.Stdout, "$ ")
- 		_, _ = reader.ReadString('\n')
- 	}
+-	// Uncomment this block to pass the first stage
+-	// fmt.Fprint(os.Stdout, "$ ")
++	fmt.Fprint(os.Stdout, "$ ")
+
+ 	// Wait for user input
+ 	bufio.NewReader(os.Stdin).ReadString('\n')
  }

solutions/python/01-oo8/code/app/main.py

@@ -2,10 +2,11 @@
 
 
 def main():
-    while True:
-        sys.stdout.write("$ ")
-        sys.stdout.flush()
-        input()
+    sys.stdout.write("$ ")
+    sys.stdout.flush()
+
+    # Wait for user input
+    input()
 
 
 if __name__ == "__main__":

solutions/python/01-oo8/diff/app/main.py.diff

@@ -1,18 +1,19 @@
-@@ -1,16 +1,12 @@
+@@ -1,17 +1,13 @@
  import sys
 
 
  def main():
 -    # You can use print statements as follows for debugging, they'll be visible when running tests.
 -    print("Logs from your program will appear here!")
 -
-     while True:
--        # Uncomment this block to pass the first stage
--        # sys.stdout.write("$ ")
--        # sys.stdout.flush()
-+        sys.stdout.write("$ ")
-+        sys.stdout.flush()
-         input()
+-    # Uncomment this block to pass the first stage
+-    # sys.stdout.write("$ ")
+-    # sys.stdout.flush()
++    sys.stdout.write("$ ")
++    sys.stdout.flush()
+
+     # Wait for user input
+     input()
 
 
  if __name__ == "__main__":

solutions/rust/01-oo8/code/src/main.rs

@@ -1,11 +1,12 @@
+#[allow(unused_imports)]
 use std::io::{self, Write};
 
 fn main() {
+    print!("$ ");
+    io::stdout().flush().unwrap();
+
+    // Wait for user input
     let stdin = io::stdin();
-    loop {
-        print!("$ ");
-        io::stdout().flush().unwrap();
-        let mut input = String::new();
-        stdin.read_line(&mut input).unwrap();
-    }
+    let mut input = String::new();
+    stdin.read_line(&mut input).unwrap();
 }

solutions/rust/01-oo8/diff/src/main.rs.diff

@@ -1,23 +1,19 @@
-@@ -1,15 +1,11 @@
+@@ -1,16 +1,12 @@
+ #[allow(unused_imports)]
  use std::io::{self, Write};
 
  fn main() {
 -    // You can use print statements as follows for debugging, they'll be visible when running tests.
 -    println!("Logs from your program will appear here!");
 -
 -    // Uncomment this block to pass the first stage
--    // let stdin = io::stdin();
--    // loop {
--    //     print!("$ ");
--    //     io::stdout().flush().unwrap();
--    //     let mut input = String::new();
--    //     stdin.read_line(&mut input).unwrap();
--    // }
-+    let stdin = io::stdin();
-+    loop {
-+        print!("$ ");
-+        io::stdout().flush().unwrap();
-+        let mut input = String::new();
-+        stdin.read_line(&mut input).unwrap();
-+    }
+-    // print!("$ ");
+-    // io::stdout().flush().unwrap();
++    print!("$ ");
++    io::stdout().flush().unwrap();
+
+     // Wait for user input
+     let stdin = io::stdin();
+     let mut input = String::new();
+     stdin.read_line(&mut input).unwrap();
  }

solutions/rust/01-oo8/explanation.md

@@ -4,13 +4,8 @@ Study and uncomment the relevant code:
 
 ```rust
 // Uncomment this block to pass the first stage
-let stdin = io::stdin();
-loop {
-    print!("$ ");
-    io::stdout().flush().unwrap();
-    let mut input = String::new();
-    stdin.read_line(&mut input).unwrap();
-}
+print!("$ ");
+io::stdout().flush().unwrap();
 ```
 
 Push your changes to pass the first stage:

starter_templates/go/cmd/myshell/main.go

@@ -10,10 +10,9 @@ func main() {
 	// You can use print statements as follows for debugging, they'll be visible when running tests.
 	fmt.Println("Logs from your program will appear here!")
 
-	reader := bufio.NewReader(os.Stdin)
-	for {
-		// Uncomment this block to pass the first stage
-		// fmt.Fprint(os.Stdout, "$ ")
-		_, _ = reader.ReadString('\n')
-	}
+	// Uncomment this block to pass the first stage
+	// fmt.Fprint(os.Stdout, "$ ")
+
+	// Wait for user input
+	bufio.NewReader(os.Stdin).ReadString('\n')
 }

starter_templates/python/app/main.py

@@ -5,11 +5,12 @@ def main():
     # You can use print statements as follows for debugging, they'll be visible when running tests.
     print("Logs from your program will appear here!")
 
-    while True:
-        # Uncomment this block to pass the first stage
-        # sys.stdout.write("$ ")
-        # sys.stdout.flush()
-        input()
+    # Uncomment this block to pass the first stage
+    # sys.stdout.write("$ ")
+    # sys.stdout.flush()
+
+    # Wait for user input
+    input()
 
 
 if __name__ == "__main__":

starter_templates/rust/src/main.rs

@@ -1,15 +1,16 @@
+#[allow(unused_imports)]
 use std::io::{self, Write};
 
 fn main() {
     // You can use print statements as follows for debugging, they'll be visible when running tests.
     println!("Logs from your program will appear here!");
 
     // Uncomment this block to pass the first stage
-    // let stdin = io::stdin();
-    // loop {
-    //     print!("$ ");
-    //     io::stdout().flush().unwrap();
-    //     let mut input = String::new();
-    //     stdin.read_line(&mut input).unwrap();
-    // }
+    // print!("$ ");
+    // io::stdout().flush().unwrap();
+
+    // Wait for user input
+    let stdin = io::stdin();
+    let mut input = String::new();
+    stdin.read_line(&mut input).unwrap();
 }