Skip to content

Commit

Permalink
Use dtolnay/rust-toolchain@stable
Browse files Browse the repository at this point in the history
  • Loading branch information
chrislearn committed Nov 10, 2023
1 parent d4ac625 commit 0acd273
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 31 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
49 changes: 25 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 0acd273

Please sign in to comment.