Merge pull request #1220 from spkenv/rust-1.87

Update to Rust 1.87.0

Author: rydrman

.github/workflows/rust.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.87.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.86.0
+      image: rust:1.87.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.86.0
+    toolchain: 1.87.0
     additional_toolchains:
       - nightly
   - kind: Shell

crates/spfs/src/check.rs

@@ -206,7 +206,10 @@ where
         tracing::debug!(?tag, "Checking tag");
         self.reporter.visit_tag(&tag);
         let result = self.check_digest(tag.target).await?;
-        let res = CheckTagResult::Checked { tag, result };
+        let res = CheckTagResult::Checked {
+            tag: Box::new(tag),
+            result,
+        };
         self.reporter.checked_tag(&res);
         Ok(res)
     }
@@ -812,7 +815,7 @@ pub enum CheckTagResult {
     Missing,
     /// The tag was checked
     Checked {
-        tag: tracking::Tag,
+        tag: Box<tracking::Tag>,
         result: CheckObjectResult,
     },
 }

crates/spfs/src/error.rs

@@ -61,7 +61,7 @@ pub enum Error {
     #[error(transparent)]
     Utf8Error(#[from] Utf8Error),
     #[error("Error communicating with the server: {0:?}")]
-    Tonic(#[from] tonic::Status),
+    Tonic(Box<tonic::Status>),
     #[error(transparent)]
     TokioJoinError(#[from] tokio::task::JoinError),
     #[error("Failed to spawn {0}")]
@@ -290,6 +290,12 @@ impl From<spfs_proto::digest::Error> for Error {
     }
 }
 
+impl From<tonic::Status> for Error {
+    fn from(value: tonic::Status) -> Self {
+        Error::Tonic(Box::new(value))
+    }
+}
+
 /// An OS error represents an error that may have an associated
 /// error code from the operating system
 pub trait OsError {

crates/spfs/src/graph/layer.rs

@@ -122,7 +122,7 @@ impl Layer {
     pub(super) fn digest_encode(&self, writer: &mut impl std::io::Write) -> Result<()> {
         // Includes any annotations regardless of the EncodingFormat setting
         let annotations = self.annotations();
-        let result = if let Some(manifest_digest) = self.manifest() {
+        if let Some(manifest_digest) = self.manifest() {
             let manifest_result =
                 encoding::write_digest(&mut *writer, manifest_digest).map_err(Error::Encoding);
             for entry in annotations {
@@ -141,9 +141,7 @@ impl Layer {
                 "Invalid Layer object for legacy encoding, it has no manifest or annotation data"
                     .to_string(),
             ))
-        };
-
-        result
+        }
     }
 
     pub(super) fn legacy_encode(&self, writer: &mut impl std::io::Write) -> Result<()> {
@@ -153,15 +151,13 @@ impl Layer {
                 "Invalid Layer object for legacy encoding, it has annotation data. Annotations are not supported with legacy encoding".to_string(),
             ));
         }
-        let result = if let Some(manifest_digest) = self.manifest() {
+        if let Some(manifest_digest) = self.manifest() {
             encoding::write_digest(writer, manifest_digest).map_err(Error::Encoding)
         } else {
             Err(Error::String(
                 "Invalid Layer object for legacy encoding, it has no manifest data".to_string(),
             ))
-        };
-
-        result
+        }
     }
 }
 

crates/spfs/src/resolve.rs

@@ -75,10 +75,7 @@ async fn render_via_subcommand(
         }
         _ => Err(Error::process_spawn_error(
             "spfs-render",
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "process exited with non-zero status",
-            ),
+            std::io::Error::other("process exited with non-zero status"),
             None,
         )),
     };

crates/spfs/src/server/payload.rs

@@ -211,12 +211,7 @@ where
 {
     // the stream must return io errors in order to be converted to a reader
     let mapped_stream = http_body_util::BodyDataStream::new(body)
-        .map_err(|err| {
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!("Failed to read response body: {err:?}"),
-            )
-        })
+        .map_err(|err| std::io::Error::other(format!("Failed to read response body: {err:?}")))
         .into_async_read();
     let stream_reader = tokio_util::compat::FuturesAsyncReadCompatExt::compat(mapped_stream);
     let buffered_reader = tokio::io::BufReader::new(stream_reader);

crates/spfs/src/storage/fs/renderer_unix.rs

@@ -643,5 +643,5 @@ where
         Ok(unsafe { tokio::fs::File::from_raw_fd(fd) })
     })
     .await
-    .map_err(|_join_err| std::io::Error::new(std::io::ErrorKind::Other, "mkdir task panic'd"))?
+    .map_err(|_join_err| std::io::Error::other("mkdir task panic'd"))?
 }

crates/spfs/src/storage/rpc/payload.rs

@@ -200,12 +200,7 @@ where
 {
     // the stream must return io errors in order to be converted to a reader
     let mapped_stream = http_body_util::BodyDataStream::new(body)
-        .map_err(|err| {
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!("Failed to read response body: {err:?}"),
-            )
-        })
+        .map_err(|err| std::io::Error::other(format!("Failed to read response body: {err:?}")))
         .into_async_read();
     let stream_reader = tokio_util::compat::FuturesAsyncReadCompatExt::compat(mapped_stream);
     let buffered_reader = tokio::io::BufReader::new(stream_reader);

crates/spk-build/src/build/binary_test.rs

@@ -544,7 +544,7 @@ async fn test_build_bad_options() {
     assert!(
         matches!(
             res,
-            Err(crate::Error::SpkSpecError(spk_schema::Error::String(_)))
+            Err(crate::Error::SpkSpecError(ref schema_err)) if matches!(&**schema_err, spk_schema::Error::String(_))
         ),
         "got {res:?}"
     );