Merge pull request #1139 from spkenv/rust-1.82

Update to Rust 1.82.0 and fix lints

.github/workflows/rust.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.80.0
+          toolchain: 1.82.0
           target: x86_64-pc-windows-gnu
           override: true
       - name: Prepare VM
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 45
     container:
-      image: rust:1.80.0
+      image: rust:1.82.0
       options: --security-opt seccomp=unconfined --privileged
     env:
       # Disable cnproc because we're in a container

.site/spi/.spdev.yaml

@@ -6,7 +6,7 @@ release_notes: |
 
 toolchain:
   - kind: Rust
-    toolchain: 1.80.0
+    toolchain: 1.82.0
     additional_toolchains:
       - nightly
   - kind: Shell

crates/spfs/src/config_test.rs

@@ -208,9 +208,8 @@ fn test_config_env_overrides<F: Fn(&Config) -> R, R: ToString>(
     let config = load_config();
     // Restore env
     for (var, orig) in cleared_vars.iter() {
-        match orig {
-            Some(orig) => std::env::set_var(var, orig),
-            None => {}
+        if let Some(orig) = orig {
+            std::env::set_var(var, orig)
         }
     }
     for (var, (_, orig)) in env_vars_to_set.iter().zip(generated_values.iter()) {

crates/spfs/src/monitor.rs

@@ -129,14 +129,12 @@ pub async fn wait_for_empty_runtime(rt: &runtime::Runtime, config: &crate::Confi
         },
     )
     .await
-    .map(|result| {
+    .inspect(|_| {
         if had_to_retry.load(Ordering::Relaxed) {
             // Want to know if this happened...
             #[cfg(feature = "sentry")]
             tracing::error!(target: "sentry", "read mount namespace succeeded after retries");
         }
-
-        result
     })
     .unwrap_or_default();
 

crates/spk-schema/crates/ident/src/request.rs

@@ -726,9 +726,8 @@ impl std::hash::Hash for PkgRequest {
         self.pkg.hash(state);
         self.prerelease_policy.hash(state);
         self.inclusion_policy.hash(state);
-        match &self.pin {
-            Some(p) => p.hash(state),
-            None => {}
+        if let Some(p) = &self.pin {
+            p.hash(state)
         };
         self.required_compat.hash(state);
         // The 'requested_by' field is not included in the hash

crates/spk-storage/src/storage/runtime.rs

@@ -539,16 +539,13 @@ async fn find_layers_by_filenames<S: AsRef<str>>(
 
         let mut paths_remaining = false;
         for (index, path_opt) in paths.iter_mut() {
-            match path_opt {
-                Some(path) => {
-                    if manifest.get_path(path).is_some() {
-                        results[*index] = layer.digest()?;
-                        *path_opt = None;
-                    } else {
-                        paths_remaining = true;
-                    }
+            if let Some(path) = path_opt {
+                if manifest.get_path(path).is_some() {
+                    results[*index] = layer.digest()?;
+                    *path_opt = None;
+                } else {
+                    paths_remaining = true;
                 }
-                None => {}
             }
         }
 

rpmbuild.Dockerfile

@@ -9,7 +9,7 @@ RUN yum install -y \
 
 RUN ln -s cmake3 /usr/bin/cmake
 # install rustup for the cargo tool and compile toolchain
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh /dev/stdin -y --default-toolchain=1.80.0
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh /dev/stdin -y --default-toolchain=1.82.0
 ENV PATH="${PATH}:/root/.cargo/bin"
 # install protobuf compiler (protoc command)
 ENV PB_REL="https://github.com/protocolbuffers/protobuf/releases"

website/layouts/partials/logo.html

@@ -1,5 +1,5 @@
 <a id="logo"
-  href='{{ (cond (and (ne .Site.Params.landingPageURL nil) (.Site.IsMultiLingual)) .Site.Params.landingPageURL "/") }}'>
+  href='{{ (cond (and (ne .Site.Params.landingPageURL nil) (hugo.IsMultilingual)) .Site.Params.landingPageURL "/") }}'>
   <div id="spk-logo" style="width:100%; height:100%;">
     {{if and (.File) (strings.Contains .File.Path "spfs/")}}
     <img style="max-width: 200px" alt="SPFS Logo" src="/images/spfs_white.png" />

website/layouts/partials/menu.html

@@ -15,7 +15,7 @@
     <ul>
       <li>
         <a class="padding"
-          href='{{ (cond (and (ne .Site.Params.landingPageURL nil) (.Site.IsMultiLingual)) .Site.Params.landingPageURL "/") }}'>{{
+          href='{{ (cond (and (ne .Site.Params.landingPageURL nil) (hugo.IsMultilingual)) .Site.Params.landingPageURL "/") }}'>{{
           safeHTML (cond (ne .Site.Params.landingPageName nil) .Site.Params.landingPageName "<i class='fas fa-home'></i>Home") }}</a>
       </li>
     </ul>
@@ -50,11 +50,11 @@ <h3>{{ if not $disableShortcutsTitle}}{{ T "Shortcuts-Title"}}{{ end }}</h3>
     </section>
     {{end}}
 
-    {{ if or .Site.IsMultiLingual $showvisitedlinks }}
+    {{ if or hugo.IsMultilingual $showvisitedlinks }}
     <section id="prefooter">
       <hr />
       <ul>
-        {{ if and .Site.IsMultiLingual (not .Site.Params.DisableLanguageSwitchingButton)}}
+        {{ if and hugo.IsMultilingual (not .Site.Params.DisableLanguageSwitchingButton)}}
         <li>
           <a class="padding">
             <i class="fas fa-language fa-fw"></i>

website/layouts/partials/search.html

@@ -7,7 +7,7 @@
 <script type="text/javascript" src="{{"js/lunr.min.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript" src="{{"js/auto-complete.js" | relURL}}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}"></script>
 <script type="text/javascript">
-    {{ if .Site.IsMultiLingual }}
+    {{ if hugo.IsMultilingual }}
         var baseurl = "{{.Site.BaseURL}}{{.Site.LanguagePrefix}}";
     {{ else }}
         var baseurl = "{{.Site.BaseURL}}";