Merge pull request rust-lang#2393 from foxfromworld/issue-2023-rename-exercises

Apply Option A naming for smart_pointers and conversions exercises

Author: senekor

dev/Cargo.toml

@@ -150,14 +150,14 @@ bin = [
   { name = "iterators4_sol", path = "../solutions/18_iterators/iterators4.rs" },
   { name = "iterators5", path = "../exercises/18_iterators/iterators5.rs" },
   { name = "iterators5_sol", path = "../solutions/18_iterators/iterators5.rs" },
-  { name = "box1", path = "../exercises/19_smart_pointers/box1.rs" },
-  { name = "box1_sol", path = "../solutions/19_smart_pointers/box1.rs" },
-  { name = "rc1", path = "../exercises/19_smart_pointers/rc1.rs" },
-  { name = "rc1_sol", path = "../solutions/19_smart_pointers/rc1.rs" },
-  { name = "arc1", path = "../exercises/19_smart_pointers/arc1.rs" },
-  { name = "arc1_sol", path = "../solutions/19_smart_pointers/arc1.rs" },
-  { name = "cow1", path = "../exercises/19_smart_pointers/cow1.rs" },
-  { name = "cow1_sol", path = "../solutions/19_smart_pointers/cow1.rs" },
+  { name = "smart_pointers1", path = "../exercises/19_smart_pointers/smart_pointers1.rs" },
+  { name = "smart_pointers1_sol", path = "../solutions/19_smart_pointers/smart_pointers1.rs" },
+  { name = "smart_pointers2", path = "../exercises/19_smart_pointers/smart_pointers2.rs" },
+  { name = "smart_pointers2_sol", path = "../solutions/19_smart_pointers/smart_pointers2.rs" },
+  { name = "smart_pointers3", path = "../exercises/19_smart_pointers/smart_pointers3.rs" },
+  { name = "smart_pointers3_sol", path = "../solutions/19_smart_pointers/smart_pointers3.rs" },
+  { name = "smart_pointers4", path = "../exercises/19_smart_pointers/smart_pointers4.rs" },
+  { name = "smart_pointers4_sol", path = "../solutions/19_smart_pointers/smart_pointers4.rs" },
   { name = "threads1", path = "../exercises/20_threads/threads1.rs" },
   { name = "threads1_sol", path = "../solutions/20_threads/threads1.rs" },
   { name = "threads2", path = "../exercises/20_threads/threads2.rs" },
@@ -178,16 +178,16 @@ bin = [
   { name = "clippy2_sol", path = "../solutions/22_clippy/clippy2.rs" },
   { name = "clippy3", path = "../exercises/22_clippy/clippy3.rs" },
   { name = "clippy3_sol", path = "../solutions/22_clippy/clippy3.rs" },
-  { name = "using_as", path = "../exercises/23_conversions/using_as.rs" },
-  { name = "using_as_sol", path = "../solutions/23_conversions/using_as.rs" },
-  { name = "from_into", path = "../exercises/23_conversions/from_into.rs" },
-  { name = "from_into_sol", path = "../solutions/23_conversions/from_into.rs" },
-  { name = "from_str", path = "../exercises/23_conversions/from_str.rs" },
-  { name = "from_str_sol", path = "../solutions/23_conversions/from_str.rs" },
-  { name = "try_from_into", path = "../exercises/23_conversions/try_from_into.rs" },
-  { name = "try_from_into_sol", path = "../solutions/23_conversions/try_from_into.rs" },
-  { name = "as_ref_mut", path = "../exercises/23_conversions/as_ref_mut.rs" },
-  { name = "as_ref_mut_sol", path = "../solutions/23_conversions/as_ref_mut.rs" },
+  { name = "conversions1", path = "../exercises/23_conversions/conversions1.rs" },
+  { name = "conversions1_sol", path = "../solutions/23_conversions/conversions1.rs" },
+  { name = "conversions2", path = "../exercises/23_conversions/conversions2.rs" },
+  { name = "conversions2_sol", path = "../solutions/23_conversions/conversions2.rs" },
+  { name = "conversions3", path = "../exercises/23_conversions/conversions3.rs" },
+  { name = "conversions3_sol", path = "../solutions/23_conversions/conversions3.rs" },
+  { name = "conversions4", path = "../exercises/23_conversions/conversions4.rs" },
+  { name = "conversions4_sol", path = "../solutions/23_conversions/conversions4.rs" },
+  { name = "conversions5", path = "../exercises/23_conversions/conversions5.rs" },
+  { name = "conversions5_sol", path = "../solutions/23_conversions/conversions5.rs" },
 ]
 
 [package]

exercises/19_smart_pointers/box1.rs …ses/19_smart_pointers/smart_pointers1.rsexercises/19_smart_pointers/box1.rs renamed to exercises/19_smart_pointers/smart_pointers1.rs exercises/19_smart_pointers/box1.rs renamed to exercises/19_smart_pointers/smart_pointers1.rs

@@ -2,14 +2,14 @@
 
 Rust offers a multitude of ways to convert a value of a given type into another type.
 
-The simplest form of type conversion is a type cast expression. It is denoted with the binary operator `as`. For instance, `println!("{}", 1 + 1.0);` would not compile, since `1` is an integer while `1.0` is a float. However, `println!("{}", 1 as f32 + 1.0)` should compile. The exercise [`using_as`](using_as.rs) tries to cover this.
+The simplest form of type conversion is a type cast expression. It is denoted with the binary operator `as`. For instance, `println!("{}", 1 + 1.0);` would not compile, since `1` is an integer while `1.0` is a float. However, `println!("{}", 1 as f32 + 1.0)` should compile. The exercise [`conversions1`](conversions1.rs) tries to cover this.
 
 Rust also offers traits that facilitate type conversions upon implementation. These traits can be found under the [`convert`](https://doc.rust-lang.org/std/convert/index.html) module.
 The traits are the following:
 
-- `From` and `Into` covered in [`from_into`](from_into.rs)
-- `TryFrom` and `TryInto` covered in [`try_from_into`](try_from_into.rs)
-- `AsRef` and `AsMut` covered in [`as_ref_mut`](as_ref_mut.rs)
+- `From` and `Into` covered in [`conversions2`](conversions2.rs)
+- `TryFrom` and `TryInto` covered in [`conversions4`](conversions4.rs)
+- `AsRef` and `AsMut` covered in [`conversions5`](conversions5.rs)
 
 Furthermore, the `std::str` module offers a trait called [`FromStr`](https://doc.rust-lang.org/std/str/trait.FromStr.html) which helps with converting strings into target types via the `parse` method on strings. If properly implemented for a given type `Person`, then `let p: Person = "Mark,20".parse().unwrap()` should both compile and run without panicking.