add all the parts in workspace's main.rs

diff --git a/Makefile b/Makefile
index 2e7758b777338d4d70527fd76de1e2aa21978944..c6c80eb1068eb9b0fa7a810db2a6779ef651c44b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,13 @@ workspace: $(WORKSPACEFILES)
 workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
        @mkdir -p .tmp/docs
        @echo "$< -> $@"
 workspace/src/%.rs: src/%.rs Makefile dup-unimpl.sed
        @mkdir -p .tmp/docs
        @echo "$< -> $@"

-       @echo "// ***Remember to enable/add this part in \`main.rs\`!***" > $@
-       @echo >> $@
-       @sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed >> $@
+       @sed '/^\s*\/\/@/d;s|\(\s*\)\S.*/\*@\*/|\1unimplemented!()|' $< | sed -f dup-unimpl.sed > $@

 
 workspace/src/main.rs:
        # Don't touch this file
 
 # Crates
 
 workspace/src/main.rs:
        # Don't touch this file
 
 # Crates

-crates:
+crates: $(WORKSPACEFILES)

        @cargo build
        @cd solutions && cargo build
        @cd workspace && cargo build
        @cargo build
        @cd solutions && cargo build
        @cd workspace && cargo build

diff --git a/src/main.rs b/src/main.rs
index 70ba7967b4ea2c227fa40da979c8debcde02d8ab..cf0cd8773b79bf9a07c40ad6e7e474399111d99d 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,7 +51,8 @@
 // (You can also execute it with `cargo run`, but you'll need to do some work before this will succeed.)
 // 
 // If you later want to update the course, do `git pull` (or re-download the zip archive).
 // (You can also execute it with `cargo run`, but you'll need to do some work before this will succeed.)
 // 
 // If you later want to update the course, do `git pull` (or re-download the zip archive).

-// Then copy the files from `workspace/src/` to your workspace that you did not yet work on. (Of course you can also
+// Then copy the files from `workspace/src/` to your workspace that you did not yet work on. Definitely
+// copy `main.rs` to make sure all the new files are actually compiled. (Of course you can also

 // copy the rest, but that would replace all your hard work by the original files with all the holes!)
 
 // Course Content
 // copy the rest, but that would replace all your hard work by the original files with all the holes!)
 
 // Course Content

diff --git a/workspace/src/main.rs b/workspace/src/main.rs
index 2db78196815ec87c61e775a8babd05349ef93f9c..5dd1592e171c3fc11662a12c43cd5dcafb0e8c46 100644 (file)
--- a/workspace/src/main.rs
+++ b/workspace/src/main.rs
@@ -1,11 +1,14 @@
 #![allow(dead_code, unused_imports, unused_variables, unused_mut)]
 
 #![allow(dead_code, unused_imports, unused_variables, unused_mut)]
 

-// Only the files imported here will be compiled. Remember to add or enable new
-// parts here as you progress through the course.
+// Only the files imported here will be compiled.

 mod part00;
 mod part00;

-// mod part01;
-// mod part02;
-// mod part03;
+mod part01;
+mod part02;
+mod part03;
+mod part04;
+mod part05;
+mod part06;
+mod part07;

 
 // This decides which part is actually run.
 fn main() {
 
 // This decides which part is actually run.
 fn main() {

diff --git a/workspace/src/part00.rs b/workspace/src/part00.rs
index 65769ef3c59374aad1ece636d11ef3b28406a0f8..aad3f21c7c92a3a8124678b0fa951468955f8e82 100644 (file)
--- a/workspace/src/part00.rs
+++ b/workspace/src/part00.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 00: Algebraic datatypes
 // ======================================
 
 // Rust-101, Part 00: Algebraic datatypes
 // ======================================
 

diff --git a/workspace/src/part01.rs b/workspace/src/part01.rs
index 0578c4325abd80800adb09bad76c41141f2f54c1..1b2460c9783c94d9a248710ec2a3aa4a5b0ca93e 100644 (file)
--- a/workspace/src/part01.rs
+++ b/workspace/src/part01.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 01: Expressions, Inherent methods
 // ================================================
 
 // Rust-101, Part 01: Expressions, Inherent methods
 // ================================================
 

diff --git a/workspace/src/part02.rs b/workspace/src/part02.rs
index ece854a7382947d72eda48d6b0fc724f1acea442..357c5a04dd7164f3a20fba737cc5b2b7d1373671 100644 (file)
--- a/workspace/src/part02.rs
+++ b/workspace/src/part02.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 02: Generic types, Traits
 // ========================================
 
 // Rust-101, Part 02: Generic types, Traits
 // ========================================
 

diff --git a/workspace/src/part03.rs b/workspace/src/part03.rs
index 96ac4bf44b787615b1ca06cc6822de936f99d566..d1aea31702010478b81427deded02ab5f419f82d 100644 (file)
--- a/workspace/src/part03.rs
+++ b/workspace/src/part03.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 03: Input
 // ========================
 
 // Rust-101, Part 03: Input
 // ========================
 

diff --git a/workspace/src/part04.rs b/workspace/src/part04.rs
index fb23f2906001b0f8111df9f0a4c45b8f4315b8a7..4f2174ad8e5a9cf2c8dd8871189c00fc13e17366 100644 (file)
--- a/workspace/src/part04.rs
+++ b/workspace/src/part04.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 04: Ownership, Borrowing
 // =======================================
 
 // Rust-101, Part 04: Ownership, Borrowing
 // =======================================
 

diff --git a/workspace/src/part05.rs b/workspace/src/part05.rs
index 1eb02d893a1c82ceb992013f039fac48f009ce44..a2da18f2a435b8fe66595de2fecad8aed74ec87b 100644 (file)
--- a/workspace/src/part05.rs
+++ b/workspace/src/part05.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 05: Clone
 // ========================
 
 // Rust-101, Part 05: Clone
 // ========================
 

diff --git a/workspace/src/part06.rs b/workspace/src/part06.rs
index a62560ea4bb300b7f725f543c91e773366b22cc8..72883277ab6304aa4bd7ec0ff8d38b05dac7488a 100644 (file)
--- a/workspace/src/part06.rs
+++ b/workspace/src/part06.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 06: Copy, Lifetimes
 // ==================================
 
 // Rust-101, Part 06: Copy, Lifetimes
 // ==================================
 

diff --git a/workspace/src/part07.rs b/workspace/src/part07.rs
index 0130637b7a83c853880c9126c2b3287099f62e07..6b779ccf929b2cff2e6e9b5beb5d38c1b27434d9 100644 (file)
--- a/workspace/src/part07.rs
+++ b/workspace/src/part07.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 07: Operator Overloading, Tests, Formatting
 // ==========================================================
 
 // Rust-101, Part 07: Operator Overloading, Tests, Formatting
 // ==========================================================
 

diff --git a/workspace/src/part08.rs b/workspace/src/part08.rs
index d02cad51e3121822385c07a2e4459e1dd2d88a4f..90c35f65a526d0b5f702a84ccf7e43f2fe017ff2 100644 (file)
--- a/workspace/src/part08.rs
+++ b/workspace/src/part08.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 08: Associated Types, Modules (WIP)
 // ==================================================
 
 // Rust-101, Part 08: Associated Types, Modules (WIP)
 // ==================================================
 

diff --git a/workspace/src/part09.rs b/workspace/src/part09.rs
index 23fd31e825fac0f66c73535b500c5f0ea6eb4fff..dc329bce3c2ad18f626ead094f5a6970a7e5d9e2 100644 (file)
--- a/workspace/src/part09.rs
+++ b/workspace/src/part09.rs
@@ -1,5 +1,3 @@
-// ***Remember to enable/add this part in `main.rs`!***
-

 // Rust-101, Part 09: Iterators (WIP)
 // =================================
 
 // Rust-101, Part 09: Iterators (WIP)
 // =================================