From ebb3ab5e55165ea5e422e0bfc0404ecbaf5bec6d Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Mon, 28 Oct 2024 23:56:12 -0300 Subject: [PATCH 1/8] switch to fenix --- flake.lock | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 21 ++++++++++++++++++--- 2 files changed, 70 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 68661d933..df24f4c08 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1730097176, + "narHash": "sha256-ufvRff76Y19mkRsmx+mAnxKE9A9VaNWC2mVY6TwumOw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "482b57f3f27a9336e0fbc62fa99ee0f624ccf4d0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -47,11 +68,42 @@ }, "root": { "inputs": { + "fenix": "fenix", "flake-parts": "flake-parts", "nixpkgs": "nixpkgs", + "rust-manifest": "rust-manifest", "systems": "systems" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1730028316, + "narHash": "sha256-FsPsSjqnqMHBgDdM24DFLw4YOw0mFKYFJBcLaI6CvI8=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "3b3a87fe9bd3f2a79942babc1d1e385b6805c384", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-manifest": { + "flake": false, + "locked": { + "narHash": "sha256-tB9BZB6nRHDk5ELIVlGYlIjViLKBjQl52nC1avhcCwA=", + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" + }, + "original": { + "type": "file", + "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 5ff2397ba..dcb900ff6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,17 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; systems.url = "github:nix-systems/default"; + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + rust-manifest = { + url = "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml"; + flake = false; + }; }; - outputs = inputs@{ nixpkgs, flake-parts, systems, ... }: + outputs = inputs@{ nixpkgs, flake-parts, systems, fenix, rust-manifest, ... }: let expressions = import ./nix; in @@ -20,9 +28,16 @@ ./nix/flake-builders.nix ]; - perSystem = { self', pkgs, lib, ... }: + perSystem = { self', pkgs, lib, system, ... }: let - glistix = pkgs.callPackage expressions.glistix { }; + rust-toolchain = (fenix.packages.${system}.fromManifestFile rust-manifest).defaultToolchain; + + rustPlatform = pkgs.makeRustPlatform { + cargo = rust-toolchain; + rustc = rust-toolchain; + }; + + glistix = pkgs.callPackage expressions.glistix { inherit rustPlatform; }; in { formatter = pkgs.nixpkgs-fmt; From d2d9ace72621636464e669fe09819d14ead73ee4 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:03:14 -0300 Subject: [PATCH 2/8] pin rust version to 1.81.0 in ci --- .github/workflows/ci.yaml | 22 +++++++++++----------- .github/workflows/release.yaml | 6 +++--- .github/workflows/test-build.yaml | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bc71fbcf1..23a5c813e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [stable] + toolchain: [1.81.0] target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl @@ -65,7 +65,7 @@ jobs: run-integration-tests: true supports-nix: true - os: macos-latest # aarch64 - toolchain: stable + toolchain: 1.81.0 target: aarch64-apple-darwin use-cross: false run-integration-tests: true @@ -88,7 +88,7 @@ jobs: if: ${{ matrix.target == 'x86_64-unknown-linux-musl'}} - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -429,9 +429,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: stable + toolchain: 1.81.0 target: wasm32-unknown-unknown - uses: actions/setup-node@v4 @@ -454,9 +454,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: stable + toolchain: 1.81.0 components: rustfmt - run: cargo fmt --all -- --check @@ -470,9 +470,9 @@ jobs: # uses: actions/checkout@v4 # # - name: Install Rust toolchain - # uses: dtolnay/rust-toolchain@stable + # uses: dtolnay/rust-toolchain@1.81.0 # with: - # toolchain: stable + # toolchain: 1.81.0 # # - name: Install cargo-deny # run: | @@ -493,9 +493,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: stable + toolchain: 1.81.0 components: clippy - name: Handle Rust dependencies caching diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e3201d326..40ef88524 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [stable] + toolchain: [1.81.0] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -124,7 +124,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.81.0 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 132af5360..9a64268c7 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -19,7 +19,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [stable] + toolchain: [1.81.0] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -44,7 +44,7 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@stable + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -121,7 +121,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.81.0 target: wasm32-unknown-unknown profile: minimal override: true From 3501a3266a5a03ccbab8418f5f9ad7f343cace05 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:24:04 -0300 Subject: [PATCH 3/8] use Rust 1.80.1 due to deprecation --- .github/workflows/ci.yaml | 22 +++++++++++----------- .github/workflows/release.yaml | 6 +++--- .github/workflows/test-build.yaml | 6 +++--- flake.lock | 6 +++--- flake.nix | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 23a5c813e..506a244b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [1.81.0] + toolchain: [1.80.1] target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl @@ -65,7 +65,7 @@ jobs: run-integration-tests: true supports-nix: true - os: macos-latest # aarch64 - toolchain: 1.81.0 + toolchain: 1.80.1 target: aarch64-apple-darwin use-cross: false run-integration-tests: true @@ -88,7 +88,7 @@ jobs: if: ${{ matrix.target == 'x86_64-unknown-linux-musl'}} - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -429,9 +429,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: - toolchain: 1.81.0 + toolchain: 1.80.1 target: wasm32-unknown-unknown - uses: actions/setup-node@v4 @@ -454,9 +454,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: - toolchain: 1.81.0 + toolchain: 1.80.1 components: rustfmt - run: cargo fmt --all -- --check @@ -470,9 +470,9 @@ jobs: # uses: actions/checkout@v4 # # - name: Install Rust toolchain - # uses: dtolnay/rust-toolchain@1.81.0 + # uses: dtolnay/rust-toolchain@1.80.1 # with: - # toolchain: 1.81.0 + # toolchain: 1.80.1 # # - name: Install cargo-deny # run: | @@ -493,9 +493,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: - toolchain: 1.81.0 + toolchain: 1.80.1 components: clippy - name: Handle Rust dependencies caching diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 40ef88524..d35e1183d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.81.0] + toolchain: [1.80.1] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -124,7 +124,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.81.0 + toolchain: 1.80.1 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 9a64268c7..14a1df7de 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -19,7 +19,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.81.0] + toolchain: [1.80.1] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -44,7 +44,7 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.80.1 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -121,7 +121,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.81.0 + toolchain: 1.80.1 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/flake.lock b/flake.lock index df24f4c08..bc93d9316 100644 --- a/flake.lock +++ b/flake.lock @@ -95,13 +95,13 @@ "rust-manifest": { "flake": false, "locked": { - "narHash": "sha256-tB9BZB6nRHDk5ELIVlGYlIjViLKBjQl52nC1avhcCwA=", + "narHash": "sha256-3EJkGxF108nDakQ5ZlSQezA8XJMIEk/c9aLDPAUfybM=", "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" + "url": "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml" }, "original": { "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" + "url": "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml" } }, "systems": { diff --git a/flake.nix b/flake.nix index dcb900ff6..4042cad18 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; rust-manifest = { - url = "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml"; + url = "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml"; flake = false; }; }; From 72bbfdb2eb8fcb419d17aeaf2436171c4dfc2dcf Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:34:02 -0300 Subject: [PATCH 4/8] use toolchain version in rs-cargo --- .github/workflows/ci.yaml | 2 ++ .github/workflows/release.yaml | 1 + .github/workflows/test-build.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 506a244b0..6eabedd53 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -124,6 +124,7 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: install + toolchain: ${{ matrix.toolchain }} args: "--path compiler-cli --target ${{ matrix.target }} --debug --locked" use-cross: ${{ matrix.use-cross }} if: ${{ matrix.run-integration-tests }} @@ -132,6 +133,7 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: test + toolchain: ${{ matrix.toolchain }} args: "--workspace --target ${{ matrix.target }}" use-cross: ${{ matrix.use-cross }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d35e1183d..5b3e463ea 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -61,6 +61,7 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: build + toolchain: ${{ matrix.toolchain }} args: --release --target ${{ matrix.target }} use-cross: ${{ matrix.use-cross }} diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 14a1df7de..b6e851f56 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -58,6 +58,7 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: build + toolchain: ${{ matrix.toolchain }} args: --release --target ${{ matrix.target }} use-cross: ${{ matrix.use-cross }} From 23037118e11961dfaf48b8951d3b744cd9b73290 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:30:20 -0300 Subject: [PATCH 5/8] backout of commit 72bbfdb2eb8fcb419d17aeaf2436171c4dfc2dcf --- .github/workflows/ci.yaml | 2 -- .github/workflows/release.yaml | 1 - .github/workflows/test-build.yaml | 1 - 3 files changed, 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6eabedd53..506a244b0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -124,7 +124,6 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: install - toolchain: ${{ matrix.toolchain }} args: "--path compiler-cli --target ${{ matrix.target }} --debug --locked" use-cross: ${{ matrix.use-cross }} if: ${{ matrix.run-integration-tests }} @@ -133,7 +132,6 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: test - toolchain: ${{ matrix.toolchain }} args: "--workspace --target ${{ matrix.target }}" use-cross: ${{ matrix.use-cross }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5b3e463ea..d35e1183d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -61,7 +61,6 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: build - toolchain: ${{ matrix.toolchain }} args: --release --target ${{ matrix.target }} use-cross: ${{ matrix.use-cross }} diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index b6e851f56..14a1df7de 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -58,7 +58,6 @@ jobs: uses: clechasseur/rs-cargo@v2 with: command: build - toolchain: ${{ matrix.toolchain }} args: --release --target ${{ matrix.target }} use-cross: ${{ matrix.use-cross }} From d6600bfa05f9eb9cbf294376104b6e47d7e8f1d3 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:30:49 -0300 Subject: [PATCH 6/8] backout of commit 3501a3266a5a03ccbab8418f5f9ad7f343cace05 --- .github/workflows/ci.yaml | 22 +++++++++++----------- .github/workflows/release.yaml | 6 +++--- .github/workflows/test-build.yaml | 6 +++--- flake.lock | 6 +++--- flake.nix | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 506a244b0..23a5c813e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [1.80.1] + toolchain: [1.81.0] target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl @@ -65,7 +65,7 @@ jobs: run-integration-tests: true supports-nix: true - os: macos-latest # aarch64 - toolchain: 1.80.1 + toolchain: 1.81.0 target: aarch64-apple-darwin use-cross: false run-integration-tests: true @@ -88,7 +88,7 @@ jobs: if: ${{ matrix.target == 'x86_64-unknown-linux-musl'}} - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -429,9 +429,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: 1.80.1 + toolchain: 1.81.0 target: wasm32-unknown-unknown - uses: actions/setup-node@v4 @@ -454,9 +454,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: 1.80.1 + toolchain: 1.81.0 components: rustfmt - run: cargo fmt --all -- --check @@ -470,9 +470,9 @@ jobs: # uses: actions/checkout@v4 # # - name: Install Rust toolchain - # uses: dtolnay/rust-toolchain@1.80.1 + # uses: dtolnay/rust-toolchain@1.81.0 # with: - # toolchain: 1.80.1 + # toolchain: 1.81.0 # # - name: Install cargo-deny # run: | @@ -493,9 +493,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: - toolchain: 1.80.1 + toolchain: 1.81.0 components: clippy - name: Handle Rust dependencies caching diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d35e1183d..40ef88524 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.80.1] + toolchain: [1.81.0] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -124,7 +124,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.80.1 + toolchain: 1.81.0 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 14a1df7de..9a64268c7 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -19,7 +19,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.80.1] + toolchain: [1.81.0] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -44,7 +44,7 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.80.1 + uses: dtolnay/rust-toolchain@1.81.0 with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -121,7 +121,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.80.1 + toolchain: 1.81.0 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/flake.lock b/flake.lock index bc93d9316..df24f4c08 100644 --- a/flake.lock +++ b/flake.lock @@ -95,13 +95,13 @@ "rust-manifest": { "flake": false, "locked": { - "narHash": "sha256-3EJkGxF108nDakQ5ZlSQezA8XJMIEk/c9aLDPAUfybM=", + "narHash": "sha256-tB9BZB6nRHDk5ELIVlGYlIjViLKBjQl52nC1avhcCwA=", "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml" + "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" }, "original": { "type": "file", - "url": "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml" + "url": "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml" } }, "systems": { diff --git a/flake.nix b/flake.nix index 4042cad18..dcb900ff6 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; rust-manifest = { - url = "https://static.rust-lang.org/dist/channel-rust-1.80.1.toml"; + url = "https://static.rust-lang.org/dist/channel-rust-1.81.0.toml"; flake = false; }; }; From e635d1e74826061d3198825b9717c1677d4926a7 Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:31:29 -0300 Subject: [PATCH 7/8] backout of commit d2d9ace72621636464e669fe09819d14ead73ee4 --- .github/workflows/ci.yaml | 22 +++++++++++----------- .github/workflows/release.yaml | 6 +++--- .github/workflows/test-build.yaml | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 23a5c813e..bc71fbcf1 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,7 +29,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [1.81.0] + toolchain: [stable] target: - x86_64-unknown-linux-gnu - x86_64-unknown-linux-musl @@ -65,7 +65,7 @@ jobs: run-integration-tests: true supports-nix: true - os: macos-latest # aarch64 - toolchain: 1.81.0 + toolchain: stable target: aarch64-apple-darwin use-cross: false run-integration-tests: true @@ -88,7 +88,7 @@ jobs: if: ${{ matrix.target == 'x86_64-unknown-linux-musl'}} - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -429,9 +429,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.81.0 + toolchain: stable target: wasm32-unknown-unknown - uses: actions/setup-node@v4 @@ -454,9 +454,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.81.0 + toolchain: stable components: rustfmt - run: cargo fmt --all -- --check @@ -470,9 +470,9 @@ jobs: # uses: actions/checkout@v4 # # - name: Install Rust toolchain - # uses: dtolnay/rust-toolchain@1.81.0 + # uses: dtolnay/rust-toolchain@stable # with: - # toolchain: 1.81.0 + # toolchain: stable # # - name: Install cargo-deny # run: | @@ -493,9 +493,9 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: - toolchain: 1.81.0 + toolchain: stable components: clippy - name: Handle Rust dependencies caching diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 40ef88524..e3201d326 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.81.0] + toolchain: [stable] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -47,7 +47,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -124,7 +124,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.81.0 + toolchain: stable target: wasm32-unknown-unknown profile: minimal override: true diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index 9a64268c7..132af5360 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -19,7 +19,7 @@ jobs: - x86_64-apple-darwin - aarch64-apple-darwin - x86_64-pc-windows-msvc - toolchain: [1.81.0] + toolchain: [stable] include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -44,7 +44,7 @@ jobs: fetch-depth: 0 - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@stable with: toolchain: ${{ matrix.toolchain }} target: ${{ matrix.target }} @@ -121,7 +121,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.81.0 + toolchain: stable target: wasm32-unknown-unknown profile: minimal override: true From bbaeb757f712375398b28fce24c575e69c97e1a1 Mon Sep 17 00:00:00 2001 From: GearsDatapacks Date: Fri, 18 Oct 2024 11:40:50 +0100 Subject: [PATCH 8/8] Rust 1.82.0 --- compiler-cli/src/panic.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler-cli/src/panic.rs b/compiler-cli/src/panic.rs index 099b6a704..69caf1692 100644 --- a/compiler-cli/src/panic.rs +++ b/compiler-cli/src/panic.rs @@ -1,13 +1,13 @@ #![allow(clippy::unwrap_used)] -use std::panic::PanicInfo; +use std::panic::PanicHookInfo; pub fn add_handler() { - std::panic::set_hook(Box::new(move |info: &PanicInfo<'_>| { + std::panic::set_hook(Box::new(move |info: &PanicHookInfo<'_>| { print_compiler_bug_message(info) })); } -fn print_compiler_bug_message(info: &PanicInfo<'_>) { +fn print_compiler_bug_message(info: &PanicHookInfo<'_>) { let message = match ( info.payload().downcast_ref::<&str>(), info.payload().downcast_ref::(),