Skip to content

Commit e6228e9

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/main'
2 parents 3e9c4c8 + 22b650c commit e6228e9

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.github/workflows/rust.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,19 @@ name: Rustlings Tests
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
pull_request:
7-
branches: [ main ]
7+
branches: [main]
88

99
env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
13+
clippy:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
- run: cargo clippy -- --deny warnings
1318
fmt:
1419
runs-on: ubuntu-latest
1520
steps:

exercises/11_hashmaps/hashmaps1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// A basket of fruits in the form of a hash map needs to be defined. The key
44
// represents the name of the fruit and the value represents how many of that
55
// particular fruit is in the basket. You have to put at least three different
6-
// types of fruits (e.g apple, banana, mango) in the basket and the total count
6+
// types of fruits (e.g. apple, banana, mango) in the basket and the total count
77
// of all the fruits should be at least five.
88
//
99
// Make me compile and pass the tests!

exercises/23_conversions/from_into.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl Default for Person {
3939
// 5. Extract the other element from the split operation and parse it into a
4040
// `usize` as the age.
4141
// If while parsing the age, something goes wrong, then return the default of
42-
// Person Otherwise, then return an instantiated Person object with the results
42+
// Person. Otherwise, then return an instantiated Person object with the results
4343

4444
// I AM NOT DONE
4545

info.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ name = "move_semantics1"
318318
path = "exercises/06_move_semantics/move_semantics1.rs"
319319
mode = "test"
320320
hint = """
321-
So you've got the "cannot borrow immutable local variable `vec` as mutable"
321+
So you've got the "cannot borrow `vec` as mutable, as it is not declared as mutable"
322322
error on the line where we push an element to the vector, right?
323323
324324
The fix for this is going to be adding one keyword, and the addition is NOT on
@@ -378,7 +378,7 @@ path = "exercises/06_move_semantics/move_semantics5.rs"
378378
mode = "test"
379379
hint = """
380380
Carefully reason about the range in which each mutable reference is in
381-
scope. Does it help to update the value of referent (`x`) immediately after
381+
scope. Does it help to update the value of `x` immediately after
382382
the mutable reference is taken? Read more about 'Mutable References'
383383
in the book's section 'References and Borrowing':
384384
https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html#mutable-references.
@@ -816,7 +816,7 @@ path = "exercises/15_traits/traits4.rs"
816816
mode = "test"
817817
hint = """
818818
Instead of using concrete types as parameters you can use traits. Try replacing
819-
the '??' with 'impl <what goes here?>'
819+
the '??' with 'impl [what goes here?]'
820820
821821
See the documentation at: https://doc.rust-lang.org/book/ch10-02-traits.html#traits-as-parameters
822822
"""
@@ -827,7 +827,7 @@ path = "exercises/15_traits/traits5.rs"
827827
mode = "compile"
828828
hint = """
829829
To ensure a parameter implements multiple traits use the '+ syntax'. Try
830-
replacing the '??' with 'impl <> + <>'.
830+
replacing the '??' with 'impl [what goes here?] + [what goes here?]'.
831831
832832
See the documentation at: https://doc.rust-lang.org/book/ch10-02-traits.html#specifying-multiple-trait-bounds-with-the--syntax
833833
"""

0 commit comments

Comments
 (0)