From 2cdb874484dd273972baf06cd1419ae0218859c8 Mon Sep 17 00:00:00 2001 From: elenatorro Date: Fri, 7 Mar 2025 16:04:36 +0100 Subject: [PATCH] :wrench: Upgrade rust to v1.85 --- .circleci/config.yml | 6 ++++++ docker/devenv/Dockerfile | 2 +- render-wasm/lint | 6 +++++- run-ci.sh | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68cf26c26d..ac280298c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -263,6 +263,12 @@ jobs: command: | cargo fmt --check + - run: + name: "lint" + working_directory: "./render-wasm" + command: | + ./lint + - run: name: "cargo tests" working_directory: "./render-wasm" diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile index 530a381d9e..29b6e7c544 100644 --- a/docker/devenv/Dockerfile +++ b/docker/devenv/Dockerfile @@ -9,7 +9,7 @@ ENV NODE_VERSION=v22.13.1 \ BABASHKA_VERSION=1.12.196 \ CLJFMT_VERSION=0.13.0 \ RUSTUP_VERSION=1.27.1 \ - RUST_VERSION=1.82.0 \ + RUST_VERSION=1.85.0 \ LANG=en_US.UTF-8 \ LC_ALL=en_US.UTF-8 diff --git a/render-wasm/lint b/render-wasm/lint index 53d695c3eb..2d0cd85641 100755 --- a/render-wasm/lint +++ b/render-wasm/lint @@ -1,4 +1,7 @@ #!/usr/bin/env bash +_SCRIPT_DIR=$(dirname $0); + +pushd $_SCRIPT_DIR; # Enable debugging if the script is run with --debug if [[ "$1" == "--debug" ]]; then @@ -33,7 +36,7 @@ ALLOWED_RULES=" -A clippy::unwrap_or_default \ -A clippy::useless_format \ -A clippy::wrong_self_convention \ - -A dead_code" + -D static_mut_refs" # ./lint --fix if [[ "$1" == "--fix" ]]; then @@ -48,3 +51,4 @@ else -- -D warnings \ $ALLOWED_RULES fi +popd \ No newline at end of file diff --git a/run-ci.sh b/run-ci.sh index 74f0bcef99..20451047e8 100755 --- a/run-ci.sh +++ b/run-ci.sh @@ -45,6 +45,6 @@ cd .. echo "################ test render-wasm ################" cd render-wasm cargo fmt --check +./lint --debug ./test cd .. -