From 9a18b815237efc4cce02d5a4a10b7f6c278e9750 Mon Sep 17 00:00:00 2001 From: angelsflyinhell Date: Tue, 19 Oct 2021 22:18:59 +0200 Subject: [PATCH 1/5] use Ordering instead of if else --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 37c10de..a092538 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,13 @@ fn main() { let number = random_int_range(0..100); loop { let input = prompt("Guess: ").parse::().expect("not a number"); - if input < number { - println!("Higher"); - } else if input > number { - println!("Lower"); - } else { - println!("Correct!"); - break; + match input.cmp(&number) { + Ordering::Less => println!("Too Small"), + Ordering::Greater => println("Too Big"), + Ordering::Equal => { + println("You win!"); + break; + } } } } From 1991397ecfce7996c091586132077644ef3d3a96 Mon Sep 17 00:00:00 2001 From: angelsflyinhell Date: Tue, 19 Oct 2021 22:30:41 +0200 Subject: [PATCH 2/5] added Ordering use and added example to lib.rs --- README.md | 1 + src/lib.rs | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a092538..da0e1d5 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ fn main() { Guessing game ```rust +use std::cmp::Ordering; use simple_std::{prompt, random_int_range}; fn main() { diff --git a/src/lib.rs b/src/lib.rs index 9a48398..c3628ff 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,24 +1,23 @@ //! //! # Example: guessing game //! ``` -//! use simple_std::{prompt, random_int_range}; -//! -//! let number = random_int_range(0..100); -//! loop { -//!# // hack the input function for this to work in the doc test -//!# fn prompt(_str: &str) -> String { -//!# random_int_range(0..100).to_string() -//!# } -//! let input = prompt("guess: ").parse::().expect("not a number"); -//! if input < number { -//! println!("Higher"); -//! } else if input > number { -//! println!("Lower"); -//! } else { -//! println!("Correct!"); -//! break; -//! } -//! } +//! use std::cmp::Ordering; +// use simple_std::{prompt, random_int_range}; +// +// fn main() { +// let number = random_int_range(0..100); +// loop { +// let input = prompt("Guess: ").parse::().expect("not a number"); +// match input.cmp(&number) { +// Ordering::Less => println!("Too Small"), +// Ordering::Greater => println("Too Big"), +// Ordering::Equal => { +// println("You win!"); +// break; +// } +// } +// } +// } //! ``` pub use io::{input, prompt}; From e09bd41185f7736fb4c4eb6d345d8df5b4689cfc Mon Sep 17 00:00:00 2001 From: angelsflyinhell Date: Tue, 19 Oct 2021 22:31:57 +0200 Subject: [PATCH 3/5] exclamation mark --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index da0e1d5..2aa2e55 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ fn main() { Ordering::Less => println!("Too Small"), Ordering::Greater => println("Too Big"), Ordering::Equal => { - println("You win!"); + println!("You win!"); break; } } From edae442575581afa92859841683154180bf72565 Mon Sep 17 00:00:00 2001 From: angelsflyinhell Date: Tue, 19 Oct 2021 22:36:01 +0200 Subject: [PATCH 4/5] idk i thought clion registered my typing last time but turns out it didnt --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index c3628ff..bc18769 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,9 +10,9 @@ // let input = prompt("Guess: ").parse::().expect("not a number"); // match input.cmp(&number) { // Ordering::Less => println!("Too Small"), -// Ordering::Greater => println("Too Big"), +// Ordering::Greater => println!("Too Big"), // Ordering::Equal => { -// println("You win!"); +// println!("You win!"); // break; // } // } From 46edba9b57ac15c90ed35c33726e05b653965894 Mon Sep 17 00:00:00 2001 From: nils <48135649+Nilstrieb@users.noreply.github.com> Date: Tue, 19 Oct 2021 22:41:45 +0200 Subject: [PATCH 5/5] fixed crate doc example --- src/lib.rs | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index bc18769..754494e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,24 +2,27 @@ //! # Example: guessing game //! ``` //! use std::cmp::Ordering; -// use simple_std::{prompt, random_int_range}; -// -// fn main() { -// let number = random_int_range(0..100); -// loop { -// let input = prompt("Guess: ").parse::().expect("not a number"); -// match input.cmp(&number) { -// Ordering::Less => println!("Too Small"), -// Ordering::Greater => println!("Too Big"), -// Ordering::Equal => { -// println!("You win!"); -// break; -// } -// } -// } -// } +//! use simple_std::{prompt, random_int_range}; +//! +//! let number = random_int_range(0..100); +//! loop { +//!# // hack the input function for this to work in the doc test +//!# fn prompt(_str: &str) -> String { +//!# random_int_range(0..100).to_string() +//!# } +//! let input = prompt("guess: ").parse::().expect("not a number"); +//! match input.cmp(&number) { +//! Ordering::Less => println!("Too Small"), +//! Ordering::Greater => println!("Too Big"), +//! Ordering::Equal => { +//! println!("You win!"); +//! break; +//! } +//! } +//! } //! ``` + pub use io::{input, prompt}; pub use random::{random_float, random_int_range};