Skip to content

Commit 283d0c8

Browse files
authored
fix: Include exercises folder in the project structure behind a feature (rust-lang#917)
closes rust-lang#859 closes rust-lang#913 closes rust-lang#942
1 parent e3a0d69 commit 283d0c8

File tree

25 files changed

+112
-1
lines changed

25 files changed

+112
-1
lines changed

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ console = "0.7.7"
1111
notify = "4.0.15"
1212
toml = "0.4.10"
1313
regex = "1.1.6"
14-
serde = {version = "1.0.10", features = ["derive"]}
14+
serde = { version = "1.0.10", features = ["derive"] }
1515

1616
[[bin]]
1717
name = "rustlings"
@@ -21,3 +21,6 @@ path = "src/main.rs"
2121
assert_cmd = "0.11.0"
2222
predicates = "1.0.1"
2323
glob = "0.3.0"
24+
25+
[features]
26+
exercises = []

exercises/advanced_errors/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod advanced_errs1;
2+
mod advanced_errs2;

exercises/clippy/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod clippy1;
2+
mod clippy2;

exercises/collections/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mod hashmap1;
2+
mod hashmap2;
3+
mod vec1;
4+
mod vec2;

exercises/conversions/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mod as_ref_mut;
2+
mod from_into;
3+
mod from_str;
4+
mod try_from_into;
5+
mod using_as;

exercises/enums/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod enums1;
2+
mod enums2;
3+
mod enums3;

exercises/error_handling/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
mod errors1;
2+
mod errors2;
3+
mod errors3;
4+
mod errors4;
5+
mod errors5;
6+
mod errors6;

exercises/functions/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mod functions1;
2+
mod functions2;
3+
mod functions3;
4+
mod functions4;
5+
mod functions5;

exercises/generics/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod generics1;
2+
mod generics2;
3+
mod generics3;

exercises/if/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod if1;
2+
mod if2;

exercises/intro/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod intro1;
2+
mod intro2;

exercises/macros/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
mod macros1;
2+
mod macros2;
3+
mod macros3;
4+
mod macros4;

exercises/mod.rs

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
mod advanced_errors;
2+
mod clippy;
3+
mod collections;
4+
mod conversions;
5+
mod enums;
6+
mod error_handling;
7+
mod functions;
8+
mod generics;
9+
mod r#if;
10+
mod intro;
11+
mod macros;
12+
mod modules;
13+
mod move_semantics;
14+
mod option;
15+
mod primitive_types;
16+
mod quiz1;
17+
mod quiz2;
18+
mod quiz3;
19+
mod quiz4;
20+
mod standard_library_types;
21+
mod strings;
22+
mod structs;
23+
mod tests;
24+
mod threads;
25+
mod traits;
26+
mod variables;

exercises/modules/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod modules1;
2+
mod modules2;
3+
mod modules3;

exercises/move_semantics/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mod move_semantics1;
2+
mod move_semantics2;
3+
mod move_semantics3;
4+
mod move_semantics4;
5+
mod move_semantics5;

exercises/option/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod option1;
2+
mod option2;
3+
mod option3;

exercises/primitive_types/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
mod primitive_types1;
2+
mod primitive_types2;
3+
mod primitive_types3;
4+
mod primitive_types4;
5+
mod primitive_types5;
6+
mod primitive_types6;
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
mod arc1;
2+
mod box1;
3+
mod iterators1;
4+
mod iterators2;
5+
mod iterators3;
6+
mod iterators4;
7+
mod iterators5;

exercises/strings/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod strings1;
2+
mod strings2;

exercises/structs/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod structs1;
2+
mod structs2;
3+
mod structs3;

exercises/tests/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mod tests1;
2+
mod tests2;
3+
mod tests3;

exercises/threads/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
mod threads1;

exercises/traits/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mod traits1;
2+
mod traits2;

exercises/variables/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
mod variables1;
2+
mod variables2;
3+
mod variables3;
4+
mod variables4;
5+
mod variables5;
6+
mod variables6;

src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#[cfg(feature = "exercises")]
2+
#[path = "../exercises/mod.rs"]
3+
mod exercises;

0 commit comments

Comments
 (0)