From c74612b6a8d638097cd5d8b4bdcb9ed0921cb69d Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Thu, 7 Apr 2022 15:14:39 +0530 Subject: [PATCH 1/2] Fixed missing semicolon and capitalization mistakes in the ownership --- en/src/ownership/ownership.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/en/src/ownership/ownership.md b/en/src/ownership/ownership.md index 335c778..fe94646 100644 --- a/en/src/ownership/ownership.md +++ b/en/src/ownership/ownership.md @@ -4,7 +4,7 @@ ```rust,editable fn main() { - // use as many approaches as you can to make it work + // Use as many approaches as you can to make it work let x = String::from("hello, world"); let y = x; println!("{},{}",x,y); @@ -39,7 +39,7 @@ fn main() { // Only modify the code below! fn give_ownership() -> String { let s = String::from("hello, world"); - // convert String to Vec + // Convert String to Vec let _s = s.into_bytes(); s } @@ -47,7 +47,7 @@ fn give_ownership() -> String { 4. 🌟🌟 ```rust,editable -// fix the error without removing code line +// Fix the error without removing code line fn main() { let s = String::from("hello, world"); @@ -63,7 +63,7 @@ fn print_str(s: String) { 5. 🌟🌟 ```rust, editable -// don't use clone ,use copy instead +// Don't use clone ,use copy instead fn main() { let x = (1, 2, (), "hello".to_string()); let y = x.clone(); @@ -80,12 +80,12 @@ Mutability can be changed when ownership is transferred. fn main() { let s = String::from("hello, "); - // modify this line only ! + // Modify this line only ! let s1 = s; s1.push_str("world"); - println!("Success!") + println!("Success!"); } ``` @@ -95,13 +95,13 @@ fn main() { fn main() { let x = Box::new(5); - let ... // implement this line, dont change other lines! + let ... // Implement this line, dont change other lines! *y = 4; assert_eq!(*x, 5); - println!("Success!") + println!("Success!"); } ``` @@ -148,7 +148,7 @@ fn main() { let _s = t.0; - // modify this line only, don't use `_s` + // Modify this line only, don't use `_s` println!("{:?}", t); } ``` @@ -159,7 +159,7 @@ fn main() { fn main() { let t = (String::from("hello"), String::from("world")); - // fill the blanks + // Fill the blanks let (__, __) = __; println!("{:?}, {:?}, {:?}", s1, s2, t); // -> "hello", "world", ("hello", "world") From 917f5e92d2f9f3a3a08f1993946a459d56e5fa66 Mon Sep 17 00:00:00 2001 From: Tanish-Eagle Date: Thu, 7 Apr 2022 15:22:02 +0530 Subject: [PATCH 2/2] Fixed missing semicolon, spelling mistakes, and capitalization in borrowing --- en/src/ownership/borrowing.md | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/en/src/ownership/borrowing.md b/en/src/ownership/borrowing.md index fea3ed7..d0de771 100644 --- a/en/src/ownership/borrowing.md +++ b/en/src/ownership/borrowing.md @@ -6,10 +6,10 @@ fn main() { let x = 5; - // fill the blank + // Fill the blank let p = __; - println!("the memory address of x is {:p}", p); // one possible output: 0x16fa3ac84 + println!("the memory address of x is {:p}", p); // One possible output: 0x16fa3ac84 } ``` @@ -20,23 +20,23 @@ fn main() { let x = 5; let y = &x; - // modify this line only + // Modify this line only assert_eq!(5, y); - println!("Success!") + println!("Success!"); } ``` 3. 🌟 ```rust,editable -// fix error +// Fix error fn main() { let mut s = String::from("hello, "); borrow_object(s); - println!("Success!") + println!("Success!"); } fn borrow_object(s: &String) {} @@ -45,13 +45,13 @@ fn borrow_object(s: &String) {} 4. 🌟 ```rust,editable -// fix error +// Fix error fn main() { let mut s = String::from("hello, "); push_str(s); - println!("Success!") + println!("Success!"); } fn push_str(s: &mut String) { @@ -65,16 +65,16 @@ fn push_str(s: &mut String) { fn main() { let mut s = String::from("hello, "); - // fill the blank to make it work + // Fill the blank to make it work let p = __; p.push_str("world"); - println!("Success!") + println!("Success!"); } ``` -#### ref +#### Ref `ref` can be used to take references to a value, similar to `&`. 6. 🌟🌟🌟 @@ -84,18 +84,18 @@ fn main() { let c = '中'; let r1 = &c; - // fill the blank，dont change other code + // Fill the blank，dont change other code let __ r2 = c; assert_eq!(*r1, *r2); - // check the equality of the two address strings + // Check the equality of the two address strings assert_eq!(get_addr(r1),get_addr(r2)); - println!("Success!") + println!("Success!"); } -// get memory address string +// Get memory address string fn get_addr(r: &char) -> String { format!("{:p}", r) } @@ -105,8 +105,8 @@ fn get_addr(r: &char) -> String { 7. 🌟 ```rust,editable -// remove something to make it work -// don't remove a whole line ! +// Remove something to make it work +// Don't remove a whole line ! fn main() { let mut s = String::from("hello"); @@ -115,21 +115,21 @@ fn main() { println!("{}, {}", r1, r2); - println!("Success!") + println!("Success!"); } ``` -#### Mutablity -8. 🌟 Error: Borrow a immutable object as mutable +#### Mutability +8. 🌟 Error: Borrow an immutable object as mutable ```rust,editable fn main() { - //fix error by modifying this line + // Fix error by modifying this line let s = String::from("hello, "); borrow_object(&mut s); - println!("Success!") + println!("Success!"); } fn borrow_object(s: &mut String) {} @@ -138,7 +138,7 @@ fn borrow_object(s: &mut String) {} 9. 🌟🌟 Ok: Borrow a mutable object as immutable ```rust,editable -// this code has no errors! +// This code has no errors! fn main() { let mut s = String::from("hello, "); @@ -146,7 +146,7 @@ fn main() { s.push_str("world"); - println!("Success!") + println!("Success!"); } fn borrow_object(s: &String) {} @@ -156,7 +156,7 @@ fn borrow_object(s: &String) {} 10. 🌟🌟 ```rust,editable -// comment one line to make it work +// Comment one line to make it work fn main() { let mut s = String::from("hello, "); @@ -178,8 +178,8 @@ fn main() { let r1 = &mut s; let r2 = &mut s; - // add one line below to make a compiler error: cannot borrow `s` as mutable more than once at a time - // you can't use r1 and r2 at the same time + // Add one line below to make a compiler error: cannot borrow `s` as mutable more than once at a time + // You can't use r1 and r2 at the same time } ```