part_main -> main

diff --git a/Makefile b/Makefile
index 706b1db48ac643b063dae9ae241c6218d5c0390a..bb5826ce06fae5684df7d76688c0470ebefb24ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,4 +8,4 @@ docs:
 
 rawsrc:
        @mkdir -p rawsrc
 
 rawsrc:
        @mkdir -p rawsrc

-       @for file in $(FILES); do echo "$$file -> raw$$file"; egrep -v "^[[:space:]]*// " "$$file" > "raw""$$file"; done
+       @for file in $(FILES); do echo "$$file -> rawsrc/$$file"; egrep -v "^[[:space:]]*// " "$$file" > "rawsrc/""$$file"; done

diff --git a/src/main.rs b/src/main.rs
index 3ee288c52f92ee9360be3d79fc6a7c054cd0991f..e151dc1ff49b3897650aea069a3521720af48a52 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,7 +57,7 @@ mod part03;
 // function.
 
 fn main() {
 // function.
 
 fn main() {

-    part00::part_main();
+    part00::main();

 }
 
 // Additional material
 }
 
 // Additional material

diff --git a/src/part00.rs b/src/part00.rs
index 90b04ef75bd6bf15d1ccc66b4cbf496c168e70ac..c92200770debf3414acdc778a23ac88a8e3655af 100644 (file)
--- a/src/part00.rs
+++ b/src/part00.rs
@@ -91,7 +91,7 @@ fn print_number_or_nothing(n: NumberOrNothing) {
 }
 
 // Putting it all together:
 }
 
 // Putting it all together:

-pub fn part_main() {
+pub fn main() {

     let vec = read_vec();
     let min = vec_min(vec);
     print_number_or_nothing(min);
     let vec = read_vec();
     let min = vec_min(vec);
     print_number_or_nothing(min);

diff --git a/src/part01.rs b/src/part01.rs
index d046a1b70330f7769276a94abe9e488591a7be80..1603c14eec792e7fa99cde49e6ae2d504dcdba5d 100644 (file)
--- a/src/part01.rs
+++ b/src/part01.rs
@@ -79,7 +79,7 @@ impl NumberOrNothing {
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,2,9,27]
 }
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,2,9,27]
 }

-pub fn part_main() {
+pub fn main() {

     let vec = read_vec();
     let min = vec_min(vec);
     min.print();
     let vec = read_vec();
     let min = vec_min(vec);
     min.print();

diff --git a/src/part02.rs b/src/part02.rs
index b8641df5877b32d0116c21e32e765ddd9067561d..51c20cf9dc76c8381d5415417d0e35033e4614b7 100644 (file)
--- a/src/part02.rs
+++ b/src/part02.rs
@@ -122,7 +122,7 @@ impl SomethingOrNothing<i32> {
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,3,9,27]
 }
 fn read_vec() -> Vec<i32> {
     vec![18,5,7,3,9,27]
 }

-pub fn part_main() {
+pub fn main() {

     let vec = read_vec();
     let min = vec_min(vec);
     min.print();
     let vec = read_vec();
     let min = vec_min(vec);
     min.print();

diff --git a/src/part03.rs b/src/part03.rs
index b9b7ce8e4745ca504e19a459c3b0318de83c744a..a7cfb1aa3919638f20ee8f607d34649f06f959c6 100644 (file)
--- a/src/part03.rs
+++ b/src/part03.rs
@@ -105,7 +105,7 @@ impl SomethingOrNothing<i32> {
 
 // If you update your `main.rs` to use part 03, `cargo run` should now ask you for some numbers,
 // and tell you the minimum. Neat, isn't it?
 
 // If you update your `main.rs` to use part 03, `cargo run` should now ask you for some numbers,
 // and tell you the minimum. Neat, isn't it?

-pub fn part_main() {
+pub fn main() {

     let vec = read_vec();
     let min = vec_min(vec);
     min.print();
     let vec = read_vec();
     let min = vec_min(vec);
     min.print();