Merge pull request #21764 from Veykril/push-wxmovumvpzqm

smol_str: Improve API surface

Author: Veykril

lib/smol_str/src/borsh.rs

@@ -16,7 +16,7 @@ impl BorshDeserialize for SmolStr {
     #[inline]
     fn deserialize_reader<R: Read>(reader: &mut R) -> borsh::io::Result<Self> {
         let len = u32::deserialize_reader(reader)?;
-        if (len as usize) < INLINE_CAP {
+        if (len as usize) <= INLINE_CAP {
             let mut buf = [0u8; INLINE_CAP];
             reader.read_exact(&mut buf[..len as usize])?;
             _ = core::str::from_utf8(&buf[..len as usize]).map_err(|err| {
@@ -29,9 +29,8 @@ impl BorshDeserialize for SmolStr {
             }))
         } else {
             // u8::vec_from_reader always returns Some on success in current implementation
-            let vec = u8::vec_from_reader(len, reader)?.ok_or_else(|| {
-                Error::new(ErrorKind::Other, "u8::vec_from_reader unexpectedly returned None")
-            })?;
+            let vec = u8::vec_from_reader(len, reader)?
+                .ok_or_else(|| Error::other("u8::vec_from_reader unexpectedly returned None"))?;
             Ok(SmolStr::from(String::from_utf8(vec).map_err(|err| {
                 let msg = err.to_string();
                 Error::new(ErrorKind::InvalidData, msg)