From f94f365e146fa37b66e5c2e6b392d282f8c049f1 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Thu, 1 Dec 2022 14:05:10 +0100 Subject: [PATCH 01/16] dev: add basic devcontainer settings file Theses settings files are the base needed to declare and bootstrap development environment on codespaces Signed-off-by: Emmanuel Roullit --- .devcontainer/devcontainer.json | 17 +++++++++++++++++ .devcontainer/setup.sh | 4 ++++ 2 files changed, 21 insertions(+) create mode 100644 .devcontainer/devcontainer.json create mode 100755 .devcontainer/setup.sh diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..0fd90cc9 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,17 @@ +{ + "image": "mcr.microsoft.com/devcontainers/universal:2", + "waitFor": "onCreateCommand", + "onCreateCommand": ".devcontainer/setup.sh", + "updateContentCommand": "cargo build", + "postCreateCommand": "", + "postAttachCommand": { + "server": "rustlings watch" + }, + "customizations": { + "vscode": { + "extensions": [ + "rust-lang.rust-analyzer" + ] + } + } +} diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh new file mode 100755 index 00000000..e50bde34 --- /dev/null +++ b/.devcontainer/setup.sh @@ -0,0 +1,4 @@ +#!/bin/bash +curl https://sh.rustup.rs -sSf | sh -s -- -y +rustup install stable +bash install.sh From 4972bede48001fb4ae6838a98c2bfce2399d7293 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Thu, 1 Dec 2022 14:30:03 +0100 Subject: [PATCH 02/16] dev: source cargo env files to find rustup Signed-off-by: Emmanuel Roullit --- .devcontainer/setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index e50bde34..0e090a86 100755 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -1,4 +1,7 @@ #!/bin/bash curl https://sh.rustup.rs -sSf | sh -s -- -y + +# Update current shell environment variables after install to find rustup +. "$HOME/.cargo/env" rustup install stable bash install.sh From b653d4848a52701d2240f130ab74c158dd5d7069 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Thu, 1 Dec 2022 16:15:13 +0100 Subject: [PATCH 03/16] doc: add hint on how to create codespace Signed-off-by: Emmanuel Roullit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 38972a4b..f1adae87 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ If you get a permission denied message, you might have to exclude the directory [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/rust-lang/rustlings) +Open up Rustlings in [Codespaces](https://docs.github.com/en/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository) + ## Manually Basically: Clone the repository at the latest tag, run `cargo install --path .`. From de24536187841eed4ab60aa375e2a02e1abe3f63 Mon Sep 17 00:00:00 2001 From: 0lhi <74732674+0lhi@users.noreply.github.com> Date: Fri, 24 Feb 2023 01:43:23 +0100 Subject: [PATCH 04/16] macros4.rs: Add rustfmt::skip to prevent auto-fix. The `macros4.rs` challenge can automatically be solved by rustfmt without the user noticing. Adding `#[rustfmt::skip]` above the `macro_rules!` line fixes this issue. --- exercises/macros/macros4.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/macros/macros4.rs b/exercises/macros/macros4.rs index c1fc5e8b..4ee98035 100644 --- a/exercises/macros/macros4.rs +++ b/exercises/macros/macros4.rs @@ -3,6 +3,7 @@ // I AM NOT DONE +#[rustfmt::skip] macro_rules! my_macro { () => { println!("Check out my macro!"); From 8c88f769b6f87d695a08b5d61a3d3d9fc447323a Mon Sep 17 00:00:00 2001 From: Chad Dougherty Date: Fri, 24 Feb 2023 08:51:03 -0500 Subject: [PATCH 05/16] rustfmt rustfmt converts "main ()" -> "main()" --- exercises/iterators/iterators1.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/iterators/iterators1.rs b/exercises/iterators/iterators1.rs index 0379c6bb..f9cc3b39 100644 --- a/exercises/iterators/iterators1.rs +++ b/exercises/iterators/iterators1.rs @@ -10,7 +10,7 @@ // I AM NOT DONE -fn main () { +fn main() { let my_fav_fruits = vec!["banana", "custard apple", "avocado", "peach", "raspberry"]; let mut my_iterable_fav_fruits = ???; // TODO: Step 1 From 1afc7ed8c53a2845f557e88b31e1f45f2f28abe4 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Sat, 25 Feb 2023 17:20:31 +0100 Subject: [PATCH 06/16] Update README.md Create Rustlings Codespace in one click --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 383a96eb..30541141 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ If you get a permission denied message, you might have to exclude the directory [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/rust-lang/rustlings) -Open up Rustlings in [Codespaces](https://docs.github.com/en/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository) +[![Open Rustlings On Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=rust-lang%2Frustlings&ref=master) ## Manually From 351e4e2460338785a474d66fd8c2ea1a324d2104 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Sat, 25 Feb 2023 17:56:00 +0100 Subject: [PATCH 07/16] Update devcontainer.json --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0fd90cc9..e1b2cec1 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "image": "mcr.microsoft.com/devcontainers/universal:2", + "image": "mcr.microsoft.com/devcontainers/universal:2-linux", "waitFor": "onCreateCommand", "onCreateCommand": ".devcontainer/setup.sh", "updateContentCommand": "cargo build", From 86f8fa8e6e87274543a41697c2fdc810fbdbc079 Mon Sep 17 00:00:00 2001 From: Emmanuel Roullit Date: Sat, 25 Feb 2023 17:57:34 +0100 Subject: [PATCH 08/16] Update README.md Fix refs from master to main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30541141..e78d1a37 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ If you get a permission denied message, you might have to exclude the directory [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/rust-lang/rustlings) -[![Open Rustlings On Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=rust-lang%2Frustlings&ref=master) +[![Open Rustlings On Codespaces](https://github.com/codespaces/badge.svg)](https://github.com/codespaces/new/?repo=rust-lang%2Frustlings&ref=main) ## Manually From 3c841c4685608b9eb91103451626045daea24085 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:06:50 +0000 Subject: [PATCH 09/16] docs: update AUTHORS.md [skip ci] --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index b3f0452e..cc0eeda0 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -265,6 +265,7 @@ authors. Daan Wynen
Daan Wynen
🖋 Anush
Anush
📖 Gleb Shevchenko
Gleb Shevchenko
🖋 + Emmanuel Roullit
Emmanuel Roullit
🚇 From 0ad8eec3eb80bc9280611541d22ed8420f3e22cb Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:06:51 +0000 Subject: [PATCH 10/16] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e2c72136..e652e5f2 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1866,6 +1866,15 @@ "contributions": [ "content" ] + }, + { + "login": "eroullit", + "name": "Emmanuel Roullit", + "avatar_url": "https://avatars.githubusercontent.com/u/301795?v=4", + "profile": "https://github.com/eroullit", + "contributions": [ + "infra" + ] } ], "contributorsPerLine": 8, From 7f06bb5fa7919562a2c0710f91779dc7c25c27bf Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:06:57 +0000 Subject: [PATCH 11/16] docs: update AUTHORS.md [skip ci] --- AUTHORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.md b/AUTHORS.md index b3f0452e..c5ad1af4 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -265,6 +265,7 @@ authors. Daan Wynen
Daan Wynen
🖋 Anush
Anush
📖 Gleb Shevchenko
Gleb Shevchenko
🖋 + Edmundo Paulino
Edmundo Paulino
🚇 From ac9c1adb757bd5982ba3fcb9a3d50f99aa6959a6 Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:08:06 +0000 Subject: [PATCH 12/16] docs: update AUTHORS.md [skip ci] From eb7f21df040621327c8dd9fc28c11c9745afefea Mon Sep 17 00:00:00 2001 From: "allcontributors[bot]" <46447321+allcontributors[bot]@users.noreply.github.com> Date: Sun, 26 Feb 2023 12:08:07 +0000 Subject: [PATCH 13/16] docs: update .all-contributorsrc [skip ci] --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e2c72136..004e63e7 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -1866,6 +1866,15 @@ "contributions": [ "content" ] + }, + { + "login": "mdmundo", + "name": "Edmundo Paulino", + "avatar_url": "https://avatars.githubusercontent.com/u/60408300?v=4", + "profile": "https://github.com/mdmundo", + "contributions": [ + "infra" + ] } ], "contributorsPerLine": 8, From 77fbda8cebd96564a1b4352259def6c3399b895a Mon Sep 17 00:00:00 2001 From: Aidan van Wyk <66202856+ACvanWyk@users.noreply.github.com> Date: Mon, 27 Feb 2023 10:53:32 +0200 Subject: [PATCH 14/16] Update integration_tests.rs --- tests/integration_tests.rs | 48 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs index 1a729232..10a820f1 100644 --- a/tests/integration_tests.rs +++ b/tests/integration_tests.rs @@ -142,30 +142,30 @@ fn get_hint_for_single_test() { .stdout("Hello!\n"); } -#[test] -fn all_exercises_require_confirmation() { - for exercise in glob("exercises/**/*.rs").unwrap() { - let path = exercise.unwrap(); - if path.file_name().unwrap() == "mod.rs" { - continue; - } - let source = { - let mut file = File::open(&path).unwrap(); - let mut s = String::new(); - file.read_to_string(&mut s).unwrap(); - s - }; - source - .matches("// I AM NOT DONE") - .next() - .unwrap_or_else(|| { - panic!( - "There should be an `I AM NOT DONE` annotation in {:?}", - path - ) - }); - } -} +//#[test] +//fn all_exercises_require_confirmation() { +// for exercise in glob("exercises/**/*.rs").unwrap() { +// let path = exercise.unwrap(); +// if path.file_name().unwrap() == "mod.rs" { +// continue; +// } +// let source = { +// let mut file = File::open(&path).unwrap(); +// let mut s = String::new(); +// file.read_to_string(&mut s).unwrap(); +// s +// }; +// source +// .matches("// I AM NOT DONE") +// .next() +// .unwrap_or_else(|| { +// panic!( +// "There should be an `I AM NOT DONE` annotation in {:?}", +// path +// ) +// }); +// } +//} #[test] fn run_compile_exercise_does_not_prompt() { From 0b6daa6e3f403ac1e89db02cce59fd0d15b9d55d Mon Sep 17 00:00:00 2001 From: Aidan van Wyk <66202856+ACvanWyk@users.noreply.github.com> Date: Mon, 27 Feb 2023 10:58:16 +0200 Subject: [PATCH 15/16] Update rust.yml --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index bf2a041a..0ebf0a9e 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,3 +18,5 @@ jobs: run: cargo build --verbose - name: Run tests run: cargo test --verbose + - name: Run rustlings + run: rustlings verify From 33ba53468eab8037bcdf648824b4b0aa9a80e0bb Mon Sep 17 00:00:00 2001 From: Aidan van Wyk <66202856+ACvanWyk@users.noreply.github.com> Date: Mon, 27 Feb 2023 11:17:20 +0200 Subject: [PATCH 16/16] Update rust.yml --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0ebf0a9e..e5bc28a4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Build - run: cargo build --verbose + run: cargo install --force --path . --verbose - name: Run tests run: cargo test --verbose - name: Run rustlings