From 2adae063f0bdf00c20aa4abb1062fca2372b7676 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:15:52 +0900
Subject: [PATCH 01/14] Add rust-toolchain.toml

---
 rust-toolchain.toml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 rust-toolchain.toml

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..146b6d6a
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2021-12-04"
+components = [ "rustfmt", "llvm-tools-preview", "rust-src" ]

From 6e4c69bb4181bb3c4b2abef6a54c6bdaf702969a Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:21:27 +0900
Subject: [PATCH 02/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9cb5a751..a284a1a1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,11 +36,6 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Set up Rust
-        run: |
-          rustup override set nightly
-          rustup component add llvm-tools-preview rust-src clippy
-
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt
 

From 64c4e4a9cd54891f0a80ccd642c88400fdbf6251 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:24:46 +0900
Subject: [PATCH 03/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a284a1a1..1c8d98b8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,9 @@ jobs:
         with:
           python-version: 3.9
 
+      - name: Install nightly Rust
+        run: rustup install nightly
+
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt
 

From 18c857ab5cc67332e8a165a557e06a59e36f61eb Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:26:44 +0900
Subject: [PATCH 04/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c8d98b8..74be7e8b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,10 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Install nightly Rust
-        run: rustup install nightly
+      - name: Set up Rust
+        run: |
+          rustup install nightly
+          rustup component add llvm-tools-preview rust-src clippy
 
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt

From 955d84e2126fe6d9e64d7db37207af081111160d Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:28:33 +0900
Subject: [PATCH 05/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74be7e8b..744a8fc1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
 
       - name: Set up Rust
         run: |
-          rustup install nightly
+          rustup install nightly-2021-12-04
           rustup component add llvm-tools-preview rust-src clippy
 
       - name: Install cargo crates

From 94902fdee900444af6b56f190f57f7aa5b4962c7 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:32:04 +0900
Subject: [PATCH 06/14] Try fixing CI builds

---
 rust-toolchain.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 146b6d6a..ec5d81bd 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,4 @@
 [toolchain]
 channel = "nightly-2021-12-04"
-components = [ "rustfmt", "llvm-tools-preview", "rust-src" ]
+components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]
+targets = [ "x86_64-unknown-linux-gnu" ]

From d4fa36f0bcf8bc127ceb5f1c0a54c34be1d97ba6 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:35:10 +0900
Subject: [PATCH 07/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 744a8fc1..32b287d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,10 +36,8 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Set up Rust
-        run: |
-          rustup install nightly-2021-12-04
-          rustup component add llvm-tools-preview rust-src clippy
+      - name: Install Rust toolchain
+        uses: actions-rs/toolchain@v1
 
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt

From 6f1c22461841437f2d6cd157f346e23e07579f20 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:39:33 +0900
Subject: [PATCH 08/14] Try fixing CI builds

---
 rust-toolchain.toml => rust-toolchain | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename rust-toolchain.toml => rust-toolchain (100%)

diff --git a/rust-toolchain.toml b/rust-toolchain
similarity index 100%
rename from rust-toolchain.toml
rename to rust-toolchain

From 0b779d901496daee49376801ffcd8fdb15407b74 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:43:43 +0900
Subject: [PATCH 09/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32b287d1..45156dfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,8 +36,14 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+      - name: Update latest rustup
+        run: rustup self update
+
+      - name: Show toolchain versions
+        run: |
+          rustup --version
+          rustc --version
+          cargo --version
 
       - name: Install cargo crates
         run: cargo install cargo-binutils rustfilt

From 5fb2008666e4a0d8e9a8d8847b8767a9e04a8416 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:47:56 +0900
Subject: [PATCH 10/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45156dfc..f98f751d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,12 @@ jobs:
       - name: Update latest rustup
         run: rustup self update
 
+      # A workaround for error: toolchain 'nightly-x86_64-unknown-linux-gnu' is not installed
+      - name: Install latest nightly Rust (workaround)
+        run: |
+          rustup install nightly
+          rustup component add llvm-tools-preview rust-src clippy
+
       - name: Show toolchain versions
         run: |
           rustup --version

From 835661473b90afaebba6c5a81aad491a1cf5e62f Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 15:48:12 +0900
Subject: [PATCH 11/14] Try fixing CI

---
 rust-toolchain => rust-toolchain.toml | 1 -
 1 file changed, 1 deletion(-)
 rename rust-toolchain => rust-toolchain.toml (73%)

diff --git a/rust-toolchain b/rust-toolchain.toml
similarity index 73%
rename from rust-toolchain
rename to rust-toolchain.toml
index ec5d81bd..cf9072da 100644
--- a/rust-toolchain
+++ b/rust-toolchain.toml
@@ -1,4 +1,3 @@
 [toolchain]
 channel = "nightly-2021-12-04"
 components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]
-targets = [ "x86_64-unknown-linux-gnu" ]

From 5ad17f43868c5a7d8cbd2386d836d29bf85e0705 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 16:14:31 +0900
Subject: [PATCH 12/14] Try fixing CI builds

---
 .github/workflows/ci.yml | 12 ++++--------
 rust-toolchain           |  1 +
 rust-toolchain.toml      |  3 ---
 3 files changed, 5 insertions(+), 11 deletions(-)
 create mode 100644 rust-toolchain
 delete mode 100644 rust-toolchain.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f98f751d..bfa7786c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,14 +36,10 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Update latest rustup
-        run: rustup self update
-
-      # A workaround for error: toolchain 'nightly-x86_64-unknown-linux-gnu' is not installed
-      - name: Install latest nightly Rust (workaround)
-        run: |
-          rustup install nightly
-          rustup component add llvm-tools-preview rust-src clippy
+      - name: Install nightly Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          components: llvm-tools-preview, rust-src, clippy
 
       - name: Show toolchain versions
         run: |
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 00000000..db56ccbd
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+nightly-2021-12-04
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index cf9072da..00000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[toolchain]
-channel = "nightly-2021-12-04"
-components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]

From 5d5b1c024aee9676636d2cc6cacc6003637b6601 Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 17:37:52 +0900
Subject: [PATCH 13/14] Try fixing CI builds

---
 Makefile            | 2 +-
 rust-toolchain      | 1 -
 rust-toolchain.toml | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 rust-toolchain
 create mode 100644 rust-toolchain.toml

diff --git a/Makefile b/Makefile
index 52805cb6..9f05bde2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ kernel_symbols := $(kernel_elf:.elf=.symbols)
 
 PROGRESS   := printf "  \\033[1;96m%8s\\033[0m  \\033[1;m%s\\033[0m\\n"
 PYTHON3    ?= python3
-CARGO      ?= cargo +nightly
+CARGO      ?= cargo
 BOCHS      ?= bochs
 NM         ?= rust-nm
 READELF    ?= readelf
diff --git a/rust-toolchain b/rust-toolchain
deleted file mode 100644
index db56ccbd..00000000
--- a/rust-toolchain
+++ /dev/null
@@ -1 +0,0 @@
-nightly-2021-12-04
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 00000000..cf9072da
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2021-12-04"
+components = [ "rustfmt", "clippy", "llvm-tools-preview", "rust-src" ]

From 255e34d09431dea156d254572c54e16f3919ae1f Mon Sep 17 00:00:00 2001
From: Seiya Nuta <nuta@seiya.me>
Date: Sat, 18 Dec 2021 17:38:18 +0900
Subject: [PATCH 14/14] Try fixing CI

---
 .github/workflows/ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bfa7786c..a64f098f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,13 +36,9 @@ jobs:
         with:
           python-version: 3.9
 
-      - name: Install nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          components: llvm-tools-preview, rust-src, clippy
-
       - name: Show toolchain versions
         run: |
+          rustup show
           rustup --version
           rustc --version
           cargo --version