diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11cf6d4e3..81bd43ee9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,6 +55,28 @@ jobs: save-if: ${{ github.ref == 'refs/heads/main' }} - run: cargo check --all --examples --tests --all-features --all-targets + check-msrv: + if: github.event.pull_request.draft == false + name: Check MSRV + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - uses: Swatinem/rust-cache@v2 + with: + cache-all-crates: "true" + save-if: ${{ github.ref == 'refs/heads/main' }} + # https://github.com/foresterre/cargo-msrv/blob/4345edfe3f4fc91cc8ae6c7d6804c0748fae92ae/.github/workflows/msrv.yml + - name: install_cargo_msrv + run: cargo install cargo-msrv --all-features + - name: version_of_cargo_msrv + run: cargo msrv --version + - name: run_cargo_msrv + run: cargo msrv --output-format json verify -- cargo check + - name: run_cargo_msrv_on_verify_failure + if: ${{ failure() }} + run: cargo msrv --output-format json -- cargo check + test: if: github.event.pull_request.draft == false name: Test Suite @@ -117,7 +139,7 @@ jobs: cache-all-crates: "true" save-if: ${{ github.ref == 'refs/heads/main' }} - run: cargo fmt --all -- --check - + typos: if: github.event.pull_request.draft == false name: Check for typos diff --git a/Cargo.toml b/Cargo.toml index a5586c112..7bbdf8efa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -171,7 +171,7 @@ repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" documentation = "https://dioxuslabs.com" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.60.0" +rust-version = "1.79.0" publish = false [dependencies] diff --git a/examples/tailwind/Cargo.toml b/examples/tailwind/Cargo.toml index 4a2158c9b..6660b8739 100644 --- a/examples/tailwind/Cargo.toml +++ b/examples/tailwind/Cargo.toml @@ -8,7 +8,6 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" documentation = "https://dioxuslabs.com" -rust-version = "1.60.0" publish = false [dependencies] diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 7311382e4..98e2ff2e6 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -8,6 +8,7 @@ description = "CLI tool for developing, testing, and publishing Dioxus apps" repository = "https://github.com/DioxusLabs/dioxus/" license = "MIT OR Apache-2.0" keywords = ["react", "gui", "cli", "dioxus", "wasm"] +rust-version = "1.79.0" [dependencies] # cli core diff --git a/packages/dioxus-lib/Cargo.toml b/packages/dioxus-lib/Cargo.toml index 7076bc7a2..86144a9bf 100644 --- a/packages/dioxus-lib/Cargo.toml +++ b/packages/dioxus-lib/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com/learn/0.5/" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.65.0" +rust-version = "1.79.0" [dependencies] dioxus-core = { workspace = true } diff --git a/packages/dioxus/Cargo.toml b/packages/dioxus/Cargo.toml index a15ab1140..4b383e404 100644 --- a/packages/dioxus/Cargo.toml +++ b/packages/dioxus/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com/learn/0.5/" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.65.0" +rust-version = "1.79.0" [dependencies] dioxus-core = { workspace = true } diff --git a/packages/rsx/src/hotreload.rs b/packages/rsx/src/hotreload.rs index 233117380..2e8bd8223 100644 --- a/packages/rsx/src/hotreload.rs +++ b/packages/rsx/src/hotreload.rs @@ -155,7 +155,7 @@ impl HotReloadedTemplate { // // The paths will be different but the dynamic indexes will be the same let template = new.to_template_with_custom_paths::( - intern(self.make_location(old.template_idx.get()).leak()), + intern(self.make_location(old.template_idx.get())), new_node_paths, new_attribute_paths, ); diff --git a/packages/signals/Cargo.toml b/packages/signals/Cargo.toml index 977c59467..b65b5e37b 100644 --- a/packages/signals/Cargo.toml +++ b/packages/signals/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/DioxusLabs/dioxus/" homepage = "https://dioxuslabs.com" keywords = ["dom", "ui", "gui", "react", "wasm"] -rust-version = "1.64.0" +rust-version = "1.79.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html