Update itoa and dirs (#1601)

launchbadge · Dec 29, 2021 · fca866d · fca866d
1 parent beb2100
commit fca866d
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sqlx-core/Cargo.toml b/sqlx-core/Cargo.toml
@@ -115,7 +115,7 @@ crossbeam-queue = "0.3.1"
 crossbeam-channel = "0.5.0"
 crossbeam-utils = { version = "0.8.1", default-features = false }
 digest = { version = "0.9.0", default-features = false, optional = true, features = ["std"] }
-dirs = { version = "3.0.1", optional = true }
+dirs = { version = "4", optional = true }
 encoding_rs = { version = "0.8.23", optional = true }
 either = "1.5.3"
 futures-channel = { version = "0.3.5", default-features = false, features = ["sink", "alloc", "std"] }
@@ -125,7 +125,7 @@ futures-util = { version = "0.3.5", default-features = false, features = ["alloc
 generic-array = { version = "0.14.4", default-features = false, optional = true }
 hex = "0.4.2"
 hmac = { version = "0.11.0", default-features = false, optional = true }
-itoa = "0.4.5"
+itoa = "1"
 ipnetwork = { version = "0.17.0", default-features = false, optional = true }
 mac_address = { version = "1.1", default-features = false, optional = true }
 libc = "0.2.71"

diff --git a/sqlx-core/src/mssql/arguments.rs b/sqlx-core/src/mssql/arguments.rs
@@ -72,7 +72,7 @@ impl MssqlArguments {
         self.name.push_str("@p");
 
         self.ordinal += 1;
-        let _ = itoa::fmt(&mut self.name, self.ordinal);
+        self.name.push_str(itoa::Buffer::new().format(self.ordinal));
 
         let MssqlArguments {
             ref name,

diff --git a/sqlx-core/src/mssql/protocol/type_info.rs b/sqlx-core/src/mssql/protocol/type_info.rs
@@ -567,7 +567,7 @@ impl TypeInfo {
                 // size
                 if self.size < 8000 && self.size > 0 {
                     s.push_str("(");
-                    let _ = itoa::fmt(&mut *s, self.size);
+                    s.push_str(itoa::Buffer::new().format(self.size));
                     s.push_str(")");
                 } else {
                     s.push_str("(max)");

diff --git a/sqlx-core/src/postgres/io/buf_mut.rs b/sqlx-core/src/postgres/io/buf_mut.rs
@@ -33,7 +33,7 @@ impl PgBufMutExt for Vec<u8> {
         // N.B. if you change this don't forget to update it in ../describe.rs
         self.extend(b"sqlx_s_");
 
-        itoa::write(&mut *self, id).unwrap();
+        self.extend(itoa::Buffer::new().format(id).as_bytes());
 
         self.push(0);
     }
@@ -44,7 +44,7 @@ impl PgBufMutExt for Vec<u8> {
         if let Some(id) = id {
             self.extend(b"sqlx_p_");
 
-            itoa::write(&mut *self, id).unwrap();
+            self.extend(itoa::Buffer::new().format(id).as_bytes());
         }
 
         self.push(0);