fix(): lock rust version in CI (QwikDev#242)

willkuerlich · Feb 28, 2022 · 1aa4184 · 1aa4184
1 parent b55e8e9
commit 1aa4184
Showing 4 changed files with 21 additions and 19 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM node:16.12.0-buster
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.58.1
+    RUST_VERSION=1.59.0
 
 
 RUN set -eux; \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
         with:
           profile: minimal
           override: true
-          toolchain: stable
+          toolchain: 1.59.0
           target: wasm32-unknown-unknown
 
       - name: Checkout
@@ -169,7 +169,7 @@ jobs:
         with:
           profile: minimal
           override: true
-          toolchain: stable
+          toolchain: 1.59.0
           target: ${{ matrix.settings.target }}
 
       - name: Cache NPM Dependencies
@@ -427,10 +427,9 @@ jobs:
       - name: Install Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-          profile: minimal
+          toolchain: 1.59.0
+          profile: default
           override: true
-          components: rustfmt, clippy
 
       - name: Cache cargo dependencies
         uses: actions/cache@v2

diff --git a/src/optimizer/core/src/parse.rs b/src/optimizer/core/src/parse.rs
@@ -466,7 +466,7 @@ fn handle_error(
         .lock()
         .map(|diagnostics| diagnostics.clone())
         .ok()
-        .unwrap_or_else(Vec::new)
+        .unwrap_or_default()
         .iter()
         .map(|diagnostic| {
             let message = diagnostic.message();

diff --git a/src/optimizer/core/src/transform.rs b/src/optimizer/core/src/transform.rs
@@ -679,18 +679,21 @@ impl<'a> Fold for QwikTransform<'a> {
                             .keys()
                             .find(|id| id.0 == new_specifier);
 
-                        if let Some(new_local) = new_local {
-                            replace_callee = Some(new_ident_from_id(new_local).as_callee());
-                        } else {
-                            HANDLER.with(|handler| {
-                                handler
-                                    .struct_span_err(
-                                        ident.span,
-                                        "Version without $ is not exported.",
-                                    )
-                                    .emit();
-                            });
-                        }
+                        new_local.map_or_else(
+                            || {
+                                HANDLER.with(|handler| {
+                                    handler
+                                        .struct_span_err(
+                                            ident.span,
+                                            "Version without $ is not exported.",
+                                        )
+                                        .emit();
+                                });
+                            },
+                            |new_local| {
+                                replace_callee = Some(new_ident_from_id(new_local).as_callee());
+                            },
+                        );
                     }
                 }
             }