Skip to content

Commit 870ba34

Browse files
authored
chore(deps): bump minitrace,toml,auto_enums,bit_flags,... (risingwavelabs#8682)
Signed-off-by: TennyZhuang <[email protected]>
1 parent 0e8f518 commit 870ba34

File tree

9 files changed

+141
-166
lines changed

9 files changed

+141
-166
lines changed

Cargo.lock

Lines changed: 126 additions & 154 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/bench/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
4444
"signal",
4545
] }
4646
tokio-stream = "0.1"
47-
toml = "0.5"
47+
toml = "0.7"
4848
tracing = "0.1"
4949
tracing-opentelemetry = { version = "0.17", optional = true }
5050
tracing-subscriber = "0.3.16"

src/common/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ arc-swap = "1"
1919
arrow-array = "34"
2020
arrow-schema = "34"
2121
async-trait = "0.1"
22-
auto_enums = "0.7"
23-
bitflags = "1.3.2"
22+
auto_enums = "0.8"
23+
bitflags = "2"
2424
byteorder = "1"
2525
bytes = "1"
2626
chrono = { version = "0.4", default-features = false, features = [
@@ -75,7 +75,7 @@ tokio = { version = "0.2", package = "madsim-tokio", features = [
7575
"time",
7676
"signal",
7777
] }
78-
toml = "0.5"
78+
toml = "0.7"
7979
tonic = { version = "0.2", package = "madsim-tonic" }
8080
tracing = "0.1"
8181
url = "2"

src/common/src/constants.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// limitations under the License.
1414

1515
pub mod hummock {
16+
#![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
17+
1618
use bitflags::bitflags;
1719
bitflags! {
1820

src/common/src/util/value_encoding/column_aware_row_encoding.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
//! We have a `Serializer` and a `Deserializer` for each schema of `Row`, which can be reused
2020
//! until schema changes
2121
22+
#![expect(clippy::disallowed_methods, reason = "used by bitflags!")]
23+
2224
use std::collections::BTreeMap;
2325
use std::sync::Arc;
2426

@@ -38,6 +40,7 @@ use crate::row::Row;
3840
// }
3941

4042
bitflags! {
43+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
4144
struct Flag: u8 {
4245
const EMPTY = 0b_1000_0000;
4346
const OFFSET8 = 0b01;
@@ -133,7 +136,7 @@ impl Serializer {
133136
let mut row_bytes = Vec::with_capacity(
134137
5 + self.encoded_column_ids.len() + encoding.offsets.len() + encoding.buf.len(), /* 5 comes from u8+u32 */
135138
);
136-
row_bytes.put_u8(encoding.flag.bits);
139+
row_bytes.put_u8(encoding.flag.bits());
137140
row_bytes.put_u32_le(self.datum_num);
138141
row_bytes.extend(&self.encoded_column_ids);
139142
row_bytes.extend(&encoding.offsets);
@@ -182,7 +185,7 @@ impl ValueRowDeserializer for Deserializer {
182185
Flag::OFFSET8 => 1,
183186
Flag::OFFSET16 => 2,
184187
Flag::OFFSET32 => 4,
185-
_ => return Err(ValueEncodingError::InvalidFlag(flag.bits)),
188+
_ => return Err(ValueEncodingError::InvalidFlag(flag.bits())),
186189
};
187190
let datum_num = encoded_bytes.get_u32_le() as usize;
188191
let offsets_start_idx = 4 * datum_num;

src/storage/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ normal = ["workspace-hack"]
1616
[dependencies]
1717
arc-swap = "1"
1818
async-trait = "0.1"
19-
auto_enums = { version = "0.7", features = ["futures"] }
19+
auto_enums = { version = "0.8", features = ["futures03"] }
2020
await-tree = "0.1.1"
2121
bytes = { version = "1", features = ["serde"] }
2222
crossbeam = "0.8.1"

src/storage/src/table/batch_table/storage_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ impl<S: StateStore, SD: ValueRowSerde> StorageTableInner<S, SD> {
479479
}))
480480
.await?;
481481

482-
#[auto_enum(futures::Stream)]
482+
#[auto_enum(futures03::Stream)]
483483
let iter = match iterators.len() {
484484
0 => unreachable!(),
485485
1 => iterators.into_iter().next().unwrap(),

src/tests/state_cleaning_test/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ serde_with = "2"
2626
tokio = { version = "0.2", package = "madsim-tokio" }
2727
tokio-postgres = "0.7.7"
2828
tokio-stream = { version = "0.1", features = ["fs"] }
29-
toml = "0.4"
29+
toml = "0.7"
3030
tracing = "0.1"
3131

3232
[target.'cfg(not(madsim))'.dependencies]

src/workspace-hack/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ publish = false
2121
ahash = { version = "0.8" }
2222
anyhow = { version = "1", features = ["backtrace"] }
2323
arrayvec = { version = "0.7", default-features = false, features = ["std"] }
24-
auto_enums = { version = "0.7", features = ["futures"] }
2524
aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
2625
aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
2726
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
112111
ahash = { version = "0.8" }
113112
anyhow = { version = "1", features = ["backtrace"] }
114113
arrayvec = { version = "0.7", default-features = false, features = ["std"] }
115-
auto_enums = { version = "0.7", features = ["futures"] }
116-
auto_enums_derive = { version = "0.7", default-features = false, features = ["futures", "std"] }
114+
auto_enums = { version = "0.8", features = ["futures03"] }
117115
aws-sdk-s3 = { version = "0.21", features = ["native-tls"] }
118116
aws-smithy-client = { version = "0.51", default-features = false, features = ["native-tls", "rustls"] }
119117
aws-types = { version = "0.51", default-features = false, features = ["hardcoded-credentials"] }

0 commit comments

Comments
 (0)