Merge branch 'main' into aleksandr.pasechnik/svls-6242-fips-features-for-bottlecap

Author: morrisonlevi

ipc/src/platform/channel/metadata.rs

@@ -25,10 +25,9 @@ impl HandlesTransport for &mut ChannelMetadata {
             let handle = hint.as_raw_fd();
             #[cfg(windows)]
             let handle = hint.as_raw_handle();
-            io::Error::new(
-                io::ErrorKind::Other,
-                format!("can't provide expected handle for hint: {:?}", handle),
-            )
+            io::Error::other(format!(
+                "can't provide expected handle for hint: {handle:?}"
+            ))
         })
     }
 }

ipc/src/platform/platform_handle.rs

@@ -63,9 +63,8 @@ impl<T> PlatformHandle<T> {
     pub(crate) fn as_owned_fd(&self) -> io::Result<&Arc<OwnedFileHandle>> {
         match &self.inner {
             Some(fd) => Ok(fd),
-            None => Err(io::Error::new(
-                io::ErrorKind::Other,
-                "attempting to unwrap FD from invalid handle".to_string(),
+            None => Err(io::Error::other(
+                "attempting to unwrap FD from invalid handle",
             )),
         }
     }
@@ -83,19 +82,14 @@ impl<T> PlatformHandle<T> {
         let shared_handle = match self.inner {
             Some(shared_handle) => shared_handle,
             None => {
-                return Err(io::Error::new(
-                    io::ErrorKind::Other,
-                    "attempting to unwrap FD from invalid handle".to_string(),
+                return Err(io::Error::other(
+                    "attempting to unwrap FD from invalid handle",
                 ))
             }
         };
 
-        Arc::try_unwrap(shared_handle).map_err(|_| {
-            io::Error::new(
-                io::ErrorKind::Other,
-                "attempting to unwrap FD from shared platform handle".to_string(),
-            )
-        })
+        Arc::try_unwrap(shared_handle)
+            .map_err(|_| io::Error::other("attempting to unwrap FD from shared platform handle"))
     }
 
     /// casts the associated type

ipc/src/transport/blocking.rs

@@ -104,10 +104,7 @@ where
                 }
             }
         }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "couldn't read entire item",
-        ))
+        Err(io::Error::other("couldn't read entire item"))
     }
 
     fn do_send(&mut self, req: OutgoingItem) -> Result<(), io::Error> {
@@ -192,10 +189,7 @@ where
                 return resp.message.map_err(|e| io::Error::new(e.kind, e.detail));
             }
         }
-        Err(io::Error::new(
-            io::ErrorKind::Other,
-            "Request is without a response",
-        ))
+        Err(io::Error::other("Request is without a response"))
     }
 }
 

ipc/src/transport/mod.rs

@@ -76,7 +76,7 @@ where
                 Some(Err(e)) => Some(Err(e.into())),
                 None => None,
             })
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+            .map_err(io::Error::other)
     }
 }
 
@@ -92,7 +92,7 @@ where
         self.project()
             .inner
             .poll_ready(cx)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+            .map_err(io::Error::other)
     }
 
     fn start_send(self: Pin<&mut Self>, item: SinkItem) -> io::Result<()> {
@@ -101,23 +101,21 @@ where
         let mut message = this.channel_metadata.lock().unwrap();
         let message = message.create_message(item)?;
 
-        this.inner
-            .start_send(message)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+        this.inner.start_send(message).map_err(io::Error::other)
     }
 
     fn poll_flush(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         self.project()
             .inner
             .poll_flush(cx)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+            .map_err(io::Error::other)
     }
 
     fn poll_close(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<io::Result<()>> {
         self.project()
             .inner
             .poll_close(cx)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+            .map_err(io::Error::other)
     }
 }
 

profiling-ffi/src/profiles/datatypes.rs

@@ -835,7 +835,6 @@ mod tests {
     #[test]
     // TODO FIX
     #[cfg_attr(miri, ignore)]
-
     fn aggregate_samples() -> anyhow::Result<()> {
         unsafe {
             let sample_type: *const ValueType = &ValueType::new("samples", "count");

sidecar/src/entry.rs

@@ -203,7 +203,7 @@ pub fn daemonize(listener: IpcServer, mut cfg: Config) -> anyhow::Result<()> {
     spawn_cfg
         .shared_lib_dependencies(lib_deps)
         .wait_spawn()
-        .map_err(|err| io::Error::new(io::ErrorKind::Other, err))
+        .map_err(io::Error::other)
         .context("Could not spawn the sidecar daemon")?;
 
     Ok(())

sidecar/src/service/blocking.rs

@@ -58,14 +58,14 @@ impl SidecarTransport {
     pub fn set_read_timeout(&mut self, timeout: Option<Duration>) -> io::Result<()> {
         match self.inner.lock() {
             Ok(mut t) => t.set_read_timeout(timeout),
-            Err(e) => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
+            Err(e) => Err(io::Error::other(e.to_string())),
         }
     }
 
     pub fn set_write_timeout(&mut self, timeout: Option<Duration>) -> io::Result<()> {
         match self.inner.lock() {
             Ok(mut t) => t.set_write_timeout(timeout),
-            Err(e) => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
+            Err(e) => Err(io::Error::other(e.to_string())),
         }
     }
 
@@ -81,14 +81,14 @@ impl SidecarTransport {
     pub fn send(&mut self, item: SidecarInterfaceRequest) -> io::Result<()> {
         match self.inner.lock() {
             Ok(mut t) => t.send(item),
-            Err(e) => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
+            Err(e) => Err(io::Error::other(e.to_string())),
         }
     }
 
     pub fn call(&mut self, item: SidecarInterfaceRequest) -> io::Result<SidecarInterfaceResponse> {
         match self.inner.lock() {
             Ok(mut t) => t.call(item),
-            Err(e) => Err(io::Error::new(io::ErrorKind::Other, e.to_string())),
+            Err(e) => Err(io::Error::other(e.to_string())),
         }
     }
 }

tinybytes/src/bytes_string.rs

@@ -7,7 +7,7 @@ use serde::ser::{Serialize, Serializer};
 use std::fmt::{Debug, Formatter};
 use std::{borrow::Borrow, hash, str::Utf8Error};
 
-#[derive(Clone, Eq, PartialEq)]
+#[derive(Clone, Default, Eq, PartialEq)]
 pub struct BytesString {
     bytes: Bytes,
 }
@@ -141,14 +141,6 @@ impl BytesString {
     }
 }
 
-impl Default for BytesString {
-    fn default() -> Self {
-        Self {
-            bytes: Bytes::empty(),
-        }
-    }
-}
-
 impl Borrow<str> for BytesString {
     fn borrow(&self) -> &str {
         self.as_str()