From 0acd273c99fdad5e41c17fb0c435d1b3380c1072 Mon Sep 17 00:00:00 2001
From: Chrislearn Young <chris@acroidea.com>
Date: Fri, 10 Nov 2023 11:09:32 +0800
Subject: [PATCH] Use `dtolnay/rust-toolchain@stable`

---
 .github/workflows/format.yml  |  6 ++---
 .github/workflows/release.yml |  5 ++--
 Cargo.toml                    | 49 ++++++++++++++++++-----------------
 3 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 564220e..bd38924 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -11,11 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-            toolchain: stable
-            components: rustfmt
-            override: true
+          components: rustfmt, clippy
       - uses: mbrobbel/rustfmt-check@master
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b517e30..e5e102f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,10 +56,9 @@ jobs:
           - crate: glory-cli
             path: crates/glory-cli
     steps:
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
+          components: rustfmt, clippy
 
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Cargo.toml b/Cargo.toml
index c9622be..2ed5784 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,39 +21,40 @@ license = "MIT OR Apache-2.0"
 categories = ["web-programming::http-server", "web-programming::websocket", "network-programming", "asynchronous"]
 
 [workspace.dependencies]
+glory-core = { version = "0.2.0", path = "crates/core", default-features = false }#
+glory-routing = { version = "0.2.0", path = "crates/routing", default-features = false }
+glory-hot-reload = { version = "0.2.0", path = "crates/hot-reload" }
+
 anyhow = "1"
-base64 = "0.21"
-url = "2"
-glory-core = { version = "0.1.0", path = "crates/core", default-features = false }
-salvo = { version = "0.58", default-features = true }                                    #
-glory-routing = { version = "0.1.0", path = "crates/routing", default-features = false }
-glory-hot-reload = { version = "0.1.0", path = "crates/hot-reload" }
-parking_lot = "0.12"
-tracing = "0.1"
-# tracing-subscriber = "0.3"
-serde = { version = "1" }
-serde_json = { version = "1" }
 async-trait = "0.1.42"
-once_cell = "1.5.2"
-wasm-bindgen = { version = "0.2", features = ["enable-interning"] }
-wasm-bindgen-futures = "0.4.31"
-paste = "1"
+base64 = "0.21"
 cfg-if = "1"
-smallvec = "1"
+config = { version = "0.13", default-features = false, features = ["toml"] }
 educe = "0.4"
-js-sys = "0.3"
-regex = "1"
+form_urlencoded = "1"
+futures = "0.3"
+futures-channel = { version = "0.3", default-features = true }
 indexmap = "2.0"
+js-sys = "0.3"
 multimap = "0.9"
+once_cell = "1.5.2"
+parking_lot = "0.12"
+paste = "1"
 percent-encoding = "2"
-form_urlencoded = "1"
-thiserror = "1"
-config = { version = "0.13", default-features = false, features = ["toml"] }
+path-slash = "0.2"
+regex = "1"
+salvo = { version = "0.58", default-features = true }    
+serde = { version = "1" }
+serde_json = { version = "1" }    
+smallvec = "1"
+thiserror = "1"                            
 tokio = { version = "1", default-features = false }
 tokio-util = { version = "0.7", default-features = false }
-path-slash = "0.2"
-futures = "0.3"
-futures-channel = { version = "0.3", default-features = true }
+tracing = "0.1"
+# tracing-subscriber = "0.3"
+url = "2"
+wasm-bindgen = { version = "0.2", features = ["enable-interning"] }
+wasm-bindgen-futures = "0.4.31"
 
 [workspace.dependencies.web-sys]
 version = "0.3"