Merge branch 'master' into patch-21

Author: pedrodesu

subjects/insertion_sort/README.md

@@ -4,7 +4,7 @@
 
 Implement the insertion-sort algorithm by creating a function named `insertion_sort`. It should execute the iterations of the algorithm **up to** the number indicated by `steps`. See the **Usage** for more information.
 
-The insertion-sort algorithm sorts an array of size `n` in ascending order. 
+The insertion-sort algorithm sorts an array of size `n` in ascending order.
 
 1. Iterates over the slice from `slice[1]` to `slice[n]`.
 
@@ -32,6 +32,8 @@ pub fn insertion_sort(slice: &mut [i32], steps: usize) {
 Here is a possible program to test your function,
 
 ```rust
+use insertion_sort::insertion_sort;
+
 fn main() {
     let mut target = [5, 3, 7, 2, 1, 6, 8, 4];
     // executes the first iteration of the algorithm

subjects/insertion_sort/main.rs

@@ -1,3 +1,5 @@
+use insertion_sort::insertion_sort;
+
 fn main() {
     let mut target = [5, 3, 7, 2, 1, 6, 8, 4];
     // executes the first iteration of the algorithm

subjects/inv_pyramid/README.md

@@ -26,7 +26,7 @@ i = 5
 ### Expected Functions
 
 ```rust
-fn inv_pyramid(v: String, i: u32) -> Vec<String> {}
+pub fn inv_pyramid(v: String, i: u32) -> Vec<String> {}
 ```
 
 ### Usage

subjects/java/checkpoints/singleton-blueprint/ExerciseRunner.java

@@ -1,5 +1,5 @@
 public class ExerciseRunner {
     public static void main(String[] args) {
-        System.out.println(Singleton.get???().whoAreYou());
+        System.out.println(Singleton.get???().ShowMessage());
     }
 }

subjects/java/checkpoints/singleton-blueprint/README.md

@@ -16,7 +16,7 @@ public class Singleton {
     public Singleton get???() {
     }
 
-    public String whoAreYou() {
+    public String ShowMessage() {
         return "Hello, I am a singleton!"
     }
 }
@@ -29,7 +29,7 @@ Here is a possible `ExerciseRunner.java` to test your class:
 ```java
 public class ExerciseRunner {
     public static void main(String[] args) {
-        System.out.println(Singleton.get???().whoAreYou());
+        System.out.println(Singleton.get???().ShowMessage());
     }
 }
 ```

subjects/own_and_return/README.md

@@ -31,12 +31,8 @@ Here is a possible program to test your function:
 ```rust
 use own_and_return::*;
 
-pub struct Film {
-    pub name: String,
-}
-
 fn main() {
-    let my_film = Film { name: "Terminator".toString() };
+    let my_film = Film { name: "Terminator".to_string() };
     println!("{}", take_film_name(/* to be implemented */));
     // the order of the print statements is intentional, if your implementation is correct,
     // you should have a compile error because my_film was consumed

subjects/own_and_return/main.rs

@@ -1,12 +1,8 @@
 use own_and_return::*;
 
-pub struct Film {
-    pub name: String,
-}
-
 fn main() {
     let my_film = Film {
-        name: "Terminator".toString(),
+        name: "Terminator".to_string(),
     };
     println!("{}", take_film_name(/* to be implemented */));
     // the order of the print statements is intentional, if your implementation is correct,