Merge branch 'master' into release/3.1.0.0.11

Author: wileyj

clarity/src/vm/analysis/type_checker/v2_05/natives/mod.rs

@@ -34,6 +34,7 @@ mod maps;
 mod options;
 mod sequences;
 
+#[allow(clippy::large_enum_variant)]
 pub enum TypedNativeFunction {
     Special(SpecialNativeFunction),
     Simple(SimpleNativeFunction),

clarity/src/vm/analysis/type_checker/v2_1/natives/mod.rs

@@ -42,6 +42,7 @@ mod maps;
 mod options;
 mod sequences;
 
+#[allow(clippy::large_enum_variant)]
 pub enum TypedNativeFunction {
     Special(SpecialNativeFunction),
     Simple(SimpleNativeFunction),

clarity/src/vm/callables.rs

@@ -35,7 +35,7 @@ use crate::vm::types::{
 };
 use crate::vm::{eval, Environment, LocalContext, Value};
 
-#[allow(clippy::type_complexity)]
+#[allow(clippy::type_complexity, clippy::large_enum_variant)]
 pub enum CallableType {
     UserFunction(DefinedFunction),
     NativeFunction(&'static str, NativeHandle, ClarityCostFunction),

clarity/src/vm/mod.rs

@@ -109,6 +109,7 @@ pub struct SnippetEvaluationResult {
 }
 
 #[derive(Debug, Clone)]
+#[allow(clippy::large_enum_variant)]
 pub enum EvaluationResult {
     Contract(ContractEvaluationResult),
     Snippet(SnippetEvaluationResult),

clarity/src/vm/types/serialization.rs

@@ -1183,18 +1183,14 @@ struct WriteCounter {
 
 impl Write for WriteCounter {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
-        let input: u32 = buf.len().try_into().map_err(|_e| {
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Serialization size would overflow u32",
-            )
-        })?;
-        self.count = self.count.checked_add(input).ok_or_else(|| {
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Serialization size would overflow u32",
-            )
-        })?;
+        let input: u32 = buf
+            .len()
+            .try_into()
+            .map_err(|_e| std::io::Error::other("Serialization size would overflow u32"))?;
+        self.count = self
+            .count
+            .checked_add(input)
+            .ok_or_else(|| std::io::Error::other("Serialization size would overflow u32"))?;
         Ok(input as usize)
     }
 

pox-locking/src/lib.rs

@@ -24,6 +24,7 @@
 //! checks if the function called requires applying or updating the
 //! `STXBalance` struct's locks, and if the function was successfully
 //! invoked. If so, it updates the PoX lock.
+#![allow(clippy::result_large_err)]
 
 use clarity::boot_util::boot_code_id;
 use clarity::vm::contexts::GlobalContext;
@@ -41,6 +42,7 @@ mod pox_3;
 mod pox_4;
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum LockingError {
     DefunctPoxContract,
     PoxAlreadyLocked,

stacks-common/src/deps_common/ctrlc/error.rs

@@ -22,7 +22,7 @@ impl Error {
 
 impl From<platform::Error> for Error {
     fn from(e: platform::Error) -> Error {
-        let system_error = std::io::Error::new(std::io::ErrorKind::Other, e);
+        let system_error = std::io::Error::other(e);
         Error::System(system_error)
     }
 }

stacks-common/src/deps_common/ctrlc/platform/windows/mod.rs

@@ -71,12 +71,8 @@ pub unsafe fn block_ctrl_c() -> Result<SignalId, Error> {
     match WaitForSingleObject(SEMAPHORE, INFINITE) {
         WAIT_OBJECT_0 => Ok(SignalId::CtrlC),
         WAIT_FAILED => Err(io::Error::last_os_error()),
-        ret => Err(io::Error::new(
-            io::ErrorKind::Other,
-            format!(
-                "WaitForSingleObject(), unexpected return value \"{:x}\"",
-                ret
-            ),
-        )),
+        ret => Err(io::Error::other(format!(
+            "WaitForSingleObject(), unexpected return value \"{ret:x}\""
+        ))),
     }
 }

stacks-common/src/util/chunked_encoding.rs

@@ -186,12 +186,9 @@ impl HttpChunkedTransferReaderState {
         assert_eq!(self.parse_step, HttpChunkedTransferParseMode::Chunk);
 
         if self.total_size >= self.max_size && self.chunk_size > 0 {
-            return Err(io::Error::new(
-                io::ErrorKind::Other,
-                ChunkedError::OverflowError(
-                    "HTTP body exceeds maximum expected length".to_string(),
-                ),
-            ));
+            return Err(io::Error::other(ChunkedError::OverflowError(
+                "HTTP body exceeds maximum expected length".to_string(),
+            )));
         }
 
         let remaining = if self.chunk_size - self.chunk_read <= (self.max_size - self.total_size) {

stacks-common/src/util/retry.rs

@@ -99,9 +99,7 @@ impl<R: Read> Read for BoundReader<'_, R> {
         let intended_read = self
             .read_so_far
             .checked_add(buf.len() as u64)
-            .ok_or_else(|| {
-                io::Error::new(io::ErrorKind::Other, "Read would overflow u64".to_string())
-            })?;
+            .ok_or_else(|| io::Error::other("Read would overflow u64".to_string()))?;
         let max_read = if intended_read > self.max_len {
             self.max_len - self.read_so_far
         } else {