From 09c0b55585f6c56d38f3c2a4c02794ed692a35b9 Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Mon, 4 Apr 2022 23:04:08 +0530 Subject: [PATCH 1/4] Fixed spellings and missing semicolons --- en/src/basic-types/numbers.md | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/en/src/basic-types/numbers.md b/en/src/basic-types/numbers.md index d0ccbbb..75332ea 100644 --- a/en/src/basic-types/numbers.md +++ b/en/src/basic-types/numbers.md @@ -4,49 +4,49 @@ 1. 🌟 -> Tips: If we don't explicitly give one type to a varible, then the compiler will infer one for us +> Tips: If we don't explicitly assign a type to a variable, then the compiler will infer one for us. ```rust,editable -// remove something to make it work +// Remove something to make it work fn main() { let x: i32 = 5; let mut y: u32 = 5; y = x; - let z = 10; // type of z ? + let z = 10; // Type of z ? - println!("Success!") + println!("Success!"); } ``` 2. 🌟 ```rust,editable -// fill the blank +// Fill the blank fn main() { let v: u16 = 38_u8 as __; - println!("Success!") + println!("Success!"); } ``` 3. 🌟🌟🌟 -> Tips: If we don't explicitly give one type to a varible, then the compiler will infer one for us +> Tips: If we don't explicitly assign a type to a variable, then the compiler will infer one for us. ```rust,editable -// modify `assert_eq!` to make it work +// Modify `assert_eq!` to make it work fn main() { let x = 5; assert_eq!("u32".to_string(), type_of(&x)); - println!("Success!") + println!("Success!"); } -// get the type of given variable, return a string representation of the type , e.g "i8", "u8", "i32", "u32" +// Get the type of given variable, return a string representation of the type , e.g "i8", "u8", "i32", "u32" fn type_of(_: &T) -> String { format!("{}", std::any::type_name::()) } @@ -55,19 +55,19 @@ fn type_of(_: &T) -> String { 4. 🌟🌟 ```rust,editable -// fill the blanks to make it work +// Fill the blanks to make it work fn main() { assert_eq!(i8::MAX, __); assert_eq!(u8::MAX, __); - println!("Success!") + println!("Success!"); } ``` 5. 🌟🌟 ```rust,editable -// fix errors and panics to make it work +// Fix errors and panics to make it work fn main() { let v1 = 251_u8 + 8; let v2 = i8::checked_add(251, 8).unwrap(); @@ -78,12 +78,12 @@ fn main() { 6. 🌟🌟 ```rust,editable -// modify `assert!` to make it work +// Modify `assert!` to make it work fn main() { let v = 1_024 + 0xff + 0o77 + 0b1111_1111; assert!(v == 1579); - println!("Success!") + println!("Success!"); } ``` @@ -93,29 +93,29 @@ fn main() { ```rust,editable -// replace ? with your answer +// Replace ? with your answer fn main() { let x = 1_000.000_1; // ? let y: f32 = 0.12; // f32 let z = 0.01_f64; // f64 - println!("Success!") + println!("Success!"); } ``` -1. 🌟🌟 make it work in two distinct ways +1. 🌟🌟 Make it work in two distinct ways ```rust,editable fn main() { assert!(0.1+0.2==0.3); - println!("Success!") + println!("Success!"); } ``` ### Range -9. 🌟🌟 two goals: 1. modify `assert!` to make it work 2. make `println!` output: 97 - 122 +9. 🌟🌟 Two goals: 1. Modify `assert!` to make it work 2. Make `println!` output: 97 - 122 ```rust,editable fn main() { @@ -135,13 +135,13 @@ fn main() { 10. 🌟🌟 ```rust,editable -// fill the blanks +// Fill the blanks use std::ops::{Range, RangeInclusive}; fn main() { assert_eq!((1..__), Range{ start: 1, end: 5 }); assert_eq!((1..__), RangeInclusive::new(1, 5)); - println!("Success!") + println!("Success!"); } ``` @@ -150,7 +150,7 @@ fn main() { 11. 🌟 ```rust,editable -// fill the blanks and fix the errors +// Fill the blanks and fix the errors fn main() { // Integer addition assert!(1u32 + 2 == __); From e46c8aedb1a5f3872add4b8cb84c4a9fd13317e3 Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Tue, 5 Apr 2022 10:41:47 +0530 Subject: [PATCH 2/4] Fixed missing semicolons in basic-types, statements-expressions --- en/src/basic-types/statements-expressions.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/en/src/basic-types/statements-expressions.md b/en/src/basic-types/statements-expressions.md index 0d8f022..ff1f83f 100644 --- a/en/src/basic-types/statements-expressions.md +++ b/en/src/basic-types/statements-expressions.md @@ -27,7 +27,7 @@ fn main() { ### Exercises 1. 🌟🌟 ```rust,editable -// make it work with two ways +// Make it work with two ways fn main() { let v = { let mut x = 1; @@ -36,7 +36,7 @@ fn main() { assert_eq!(v, 3); - println!("Success!") + println!("Success!"); } ``` @@ -48,7 +48,7 @@ fn main() { assert!(v == 3); - println!("Success!") + println!("Success!"); } ``` @@ -59,7 +59,7 @@ fn main() { let s = sum(1 , 2); assert_eq!(s, 3); - println!("Success!") + println!("Success!"); } fn sum(x: i32, y: i32) -> i32 { From 53bd5941cd7d1d4a09eb3a88de1332ec13d4abd9 Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Tue, 5 Apr 2022 12:28:35 +0530 Subject: [PATCH 3/4] Fixed missing semicolons and spelling mistakes in basic-types functions --- en/src/basic-types/functions.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/en/src/basic-types/functions.md b/en/src/basic-types/functions.md index f6adb06..f4d2762 100644 --- a/en/src/basic-types/functions.md +++ b/en/src/basic-types/functions.md @@ -3,13 +3,13 @@ ```rust,editable fn main() { - // don't modify the following two lines! + // Don't modify the following two lines! let (x, y) = (1, 2); let s = sum(x, y); assert_eq!(s, 3); - println!("Success!") + println!("Success!"); } fn sum(x, y: i32) { @@ -24,9 +24,9 @@ fn main() { print(); } -// replace i32 with another type +// Replace i32 with another type fn print() -> i32 { - println!("Success!") + println!("Success!"); } ``` @@ -34,16 +34,16 @@ fn print() -> i32 { 3. 🌟🌟🌟 ```rust,editable -// solve it in two ways +// Solve it in two ways // DON'T let `println!` works fn main() { never_return(); - println!("Failed!") + println!("Failed!"); } fn never_return() -> ! { - // implement this function, don't modify the fn signatures + // Implement this function, don't modify the fn signatures } ``` @@ -90,11 +90,11 @@ fn main() { // Diverging functions can also be used in match expression to replace a value of any value false => { println!("Success!"); - panic!("we have no value for `false`, but we can panic") + panic!("we have no value for `false`, but we can panic"); } }; - println!("Excercise Failed if printing out this line!"); + println!("Exercise Failed if printing out this line!"); } ``` From e70f529c72b5cecad1d802b1351788be5b320b1f Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Tue, 5 Apr 2022 14:07:55 +0530 Subject: [PATCH 4/4] Fixed missing semicolons in basic-types, char-bool-unit --- en/src/basic-types/char-bool-unit.md | 30 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/en/src/basic-types/char-bool-unit.md b/en/src/basic-types/char-bool-unit.md index b66b585..87e0223 100644 --- a/en/src/basic-types/char-bool-unit.md +++ b/en/src/basic-types/char-bool-unit.md @@ -4,7 +4,7 @@ 1. 🌟 ```rust, editable -// make it work +// Make it work use std::mem::size_of_val; fn main() { let c1 = 'a'; @@ -13,14 +13,14 @@ fn main() { let c2 = '中'; assert_eq!(size_of_val(&c2),3); - println!("Success!") + println!("Success!"); } ``` 2. 🌟 ```rust, editable -// make it work +// Make it work fn main() { let c1 = "中"; print_char(c1); @@ -35,13 +35,13 @@ fn print_char(c : char) { 3. 🌟 ```rust, editable -// make println! work +// Make println! work fn main() { let _f: bool = false; let t = true; if !t { - println!("Success!") + println!("Success!"); } } ``` @@ -49,13 +49,13 @@ fn main() { 4. 🌟 ```rust, editable -// make it work +// Make it work fn main() { let f = true; let t = true && false; assert_eq!(t, f); - println!("Success!") + println!("Success!"); } ``` @@ -64,36 +64,36 @@ fn main() { 5. 🌟🌟 ```rust,editable -// make it work, don't modify `implicitly_ret_unit` ! +// Make it work, don't modify `implicitly_ret_unit` ! fn main() { let _v: () = (); let v = (2, 3); assert_eq!(v, implicitly_ret_unit()); - println!("Success!") + println!("Success!"); } fn implicitly_ret_unit() { - println!("I will return a ()") + println!("I will return a ()"); } -// don't use this one +// Don't use this one fn explicitly_ret_unit() -> () { - println!("I will return a ()") + println!("I will return a ()"); } ``` -6. 🌟🌟 what's the size of the unit type? +6. 🌟🌟 What's the size of the unit type? ```rust,editable -// modify `4` in assert to make it work +// Modify `4` in assert to make it work use std::mem::size_of_val; fn main() { let unit: () = (); assert!(size_of_val(&unit) == 4); - println!("Success!") + println!("Success!"); } ```