Skip to content

Commit f3c2301

Browse files
authored
Merge branch '01-edu:master' into master
2 parents 23071aa + 543cba7 commit f3c2301

8 files changed

Lines changed: 14 additions & 19 deletions

File tree

subjects/box_recursion/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ pub struct WorkEnvironment {
3030
pub grade: Link,
3131
}
3232

33-
pub type Link;
33+
pub type Link = _; // Complete type alias
3434

3535
#[derive(Debug)]
3636
pub struct Worker {
37-
pub role: String,
37+
pub role: Role,
3838
pub name: String,
3939
pub next: Link,
4040
}

subjects/division_and_remainder/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ $
3737

3838
### Notions
3939

40-
- [The Tuple Type](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html?highlight=accessing%20a%20tuple#compound-types)
40+
- [The Tuple Type](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html#the-tuple-type)
4141

4242
- [Tuples](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html)
4343

44-
- [Tuple Structs without Named Fields](https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html?highlight=tuple#using-tuple-structs-without-named-fields-to-create-different-types)
44+
- [Tuple Structs without Named Fields](https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html#using-tuple-structs-without-named-fields-to-create-different-types)

subjects/get_document_id/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Create the following structures which will help you get the `document_id` of the
1313

1414
The `u32` is the `id` of the office generating the error.
1515

16-
Beside the structures, you must create a **function** named `get_document_id`, and associate it to the `OfficeOne` structure.
16+
Besides the structures, you must create a **function** named `get_document_id`, and associate it to the `OfficeOne` structure.
1717

1818
This **function** should return the `Result` value in the `OfficeFour` structure or the first `Err` it finds in the chain.
1919

subjects/previousprime/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Instructions
44

5-
Create a **function** which returns the first prime number which is less than or equal to the `u64` passed as an argument.
5+
Create a **function** which returns the biggest prime number which is smaller than the `u64` passed as an argument.
66

77
If there are no smaller primes, the function should return `0`.
88

@@ -13,13 +13,13 @@ If there are no smaller primes, the function should return `0`.
1313

1414
```rust
1515
pub fn prev_prime(nbr: u64) -> u64 {
16-
16+
todo!()
1717
}
1818
```
1919

2020
### Usage
2121

22-
Here is a possible program to test your function :
22+
Here is a possible program to test your function:
2323

2424
```rust
2525
use previousprime::*;
@@ -29,7 +29,7 @@ fn main() {
2929
}
3030
```
3131

32-
And its output :
32+
And its output:
3333

3434
```console
3535
$ cargo run

subjects/previousprime/main.rs

Lines changed: 0 additions & 5 deletions
This file was deleted.

subjects/profanity_filter/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ $
4141

4242
### Notions
4343

44-
- [Result Definition](https://doc.rust-lang.org/stable/book/ch09-02-recoverable-errors-with-result.html?highlight=result#recoverable-errors-with-result)
44+
- [Result Definition](https://doc.rust-lang.org/stable/book/ch09-02-recoverable-errors-with-result.html)

subjects/rot21/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The purpose of this exercise is to create a `rot21` function that works like the
66

77
This function will receive a `string` and will rotate each letter of that `string` 21 times to the right.
88

9-
The function should only rotate letters. Punctuation, symbols and numbers should remain the unchanged.
9+
The function should only rotate letters. Punctuation, symbols and numbers should remain unchanged.
1010

1111
### Expected functions
1212

subjects/tuples_refs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ $
4646

4747
- [Defining a struct](https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html)
4848

49-
- [The Tuple Type](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html?highlight=accessing%20a%20tuple#compound-types)
49+
- [The Tuple Type](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html#the-tuple-type)
5050

5151
- [Tuples](https://doc.rust-lang.org/rust-by-example/primitives/tuples.html)
5252

53-
- [Tuple Structs without Named Fields](https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html?highlight=tuple#using-tuple-structs-without-named-fields-to-create-different-types)
53+
- [Tuple Structs without Named Fields](https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html#using-tuple-structs-without-named-fields-to-create-different-types)
5454

55-
- [Adding Useful Functionality with Derived Traits](https://doc.rust-lang.org/stable/book/ch05-02-example-structs.html?highlight=debug%20deriv#adding-useful-functionality-with-derived-traits)
55+
- [Adding Useful Functionality with Derived Traits](https://doc.rust-lang.org/stable/book/ch05-02-example-structs.html?#adding-useful-functionality-with-derived-traits)
5656

5757
- [Chapter 7](https://doc.rust-lang.org/stable/book/ch07-03-paths-for-referring-to-an-item-in-the-module-tree.html)

0 commit comments

Comments
 (0)