chore(deps): bump minitrace,toml,auto_enums,bit_flags,... (risingwave…

…labs#8682) Signed-off-by: TennyZhuang <zty0826@gmail.com>
Little-Wallace · Mar 21, 2023 · 870ba34 · 870ba34
1 parent 0e8f518
commit 870ba34
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 166 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/bench/Cargo.toml b/src/bench/Cargo.toml
@@ -44,7 +44,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
     "signal",
 ] }
 tokio-stream = "0.1"
-toml = "0.5"
+toml = "0.7"
 tracing = "0.1"
 tracing-opentelemetry = { version = "0.17", optional = true }
 tracing-subscriber = "0.3.16"

diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
@@ -19,8 +19,8 @@ arc-swap = "1"
 arrow-array = "34"
 arrow-schema = "34"
 async-trait = "0.1"
-auto_enums = "0.7"
-bitflags = "1.3.2"
+auto_enums = "0.8"
+bitflags = "2"
 byteorder = "1"
 bytes = "1"
 chrono = { version = "0.4", default-features = false, features = [
@@ -75,7 +75,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
     "time",
     "signal",
 ] }
-toml = "0.5"
+toml = "0.7"
 tonic = { version = "0.2", package = "madsim-tonic" }
 tracing = "0.1"
 url = "2"

diff --git a/src/common/src/constants.rs b/src/common/src/constants.rs
@@ -13,6 +13,8 @@
 // limitations under the License.
 
 pub mod hummock {
+    #![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
+
     use bitflags::bitflags;
     bitflags! {
 

diff --git a/src/common/src/util/value_encoding/column_aware_row_encoding.rs b/src/common/src/util/value_encoding/column_aware_row_encoding.rs
@@ -19,6 +19,8 @@
 //! We have a `Serializer` and a `Deserializer` for each schema of `Row`, which can be reused
 //! until schema changes
 
+#![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
+
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
@@ -38,6 +40,7 @@ use crate::row::Row;
 // }
 
 bitflags! {
+    #[derive(Debug, Clone, Copy, PartialEq, Eq)]
     struct Flag: u8 {
         const EMPTY = 0b_1000_0000;
         const OFFSET8 = 0b01;
@@ -133,7 +136,7 @@ impl Serializer {
         let mut row_bytes = Vec::with_capacity(
             5 + self.encoded_column_ids.len() + encoding.offsets.len() + encoding.buf.len(), /* 5 comes from u8+u32 */
         );
-        row_bytes.put_u8(encoding.flag.bits);
+        row_bytes.put_u8(encoding.flag.bits());
         row_bytes.put_u32_le(self.datum_num);
         row_bytes.extend(&self.encoded_column_ids);
         row_bytes.extend(&encoding.offsets);
@@ -182,7 +185,7 @@ impl ValueRowDeserializer for Deserializer {
             Flag::OFFSET8 => 1,
             Flag::OFFSET16 => 2,
             Flag::OFFSET32 => 4,
-            _ => return Err(ValueEncodingError::InvalidFlag(flag.bits)),
+            _ => return Err(ValueEncodingError::InvalidFlag(flag.bits())),
         };
         let datum_num = encoded_bytes.get_u32_le() as usize;
         let offsets_start_idx = 4 * datum_num;

diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
@@ -16,7 +16,7 @@ normal = ["workspace-hack"]
 [dependencies]
 arc-swap = "1"
 async-trait = "0.1"
-auto_enums = { version = "0.7", features = ["futures"] }
+auto_enums = { version = "0.8", features = ["futures03"] }
 await-tree = "0.1.1"
 bytes = { version = "1", features = ["serde"] }
 crossbeam = "0.8.1"

diff --git a/src/storage/src/table/batch_table/storage_table.rs b/src/storage/src/table/batch_table/storage_table.rs
@@ -479,7 +479,7 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
         }))
         .await?;
 
-        #[auto_enum(futures::Stream)]
+        #[auto_enum(futures03::Stream)]
         let iter = match iterators.len() {
             0 => unreachable!(),
             1 => iterators.into_iter().next().unwrap(),

diff --git a/src/tests/state_cleaning_test/Cargo.toml b/src/tests/state_cleaning_test/Cargo.toml
@@ -26,7 +26,7 @@ serde_with = "2"
 tokio = { version = "0.2", package = "madsim-tokio" }
 tokio-postgres = "0.7.7"
 tokio-stream = { version = "0.1", features = ["fs"] }
-toml = "0.4"
+toml = "0.7"
 tracing = "0.1"
 
 [target.'cfg(not(madsim))'.dependencies]

diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml
@@ -21,7 +21,6 @@ publish = false
 ahash = { version = "0.8" }
 anyhow = { version = "1", features = ["backtrace"] }
 arrayvec = { version = "0.7", default-features = false, features = ["std"] }
-auto_enums = { version = "0.7", features = ["futures"] }
 aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
 aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
 aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }
@@ -112,8 +111,7 @@ zstd-sys = { version = "2", default-features = false, features = ["legacy", "std
 ahash = { version = "0.8" }
 anyhow = { version = "1", features = ["backtrace"] }
 arrayvec = { version = "0.7", default-features = false, features = ["std"] }
-auto_enums = { version = "0.7", features = ["futures"] }
-auto_enums_derive = { version = "0.7", default-features = false, features = ["futures", "std"] }
+auto_enums = { version = "0.8", features = ["futures03"] }
 aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
 aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
 aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }