Skip to content

Commit 36a4c6c

Browse files
committed
bump proto and clippy fixes
No functional changes Signed-off-by: Matt Klein <[email protected]>
1 parent 4608094 commit 36a4c6c

File tree

26 files changed

+1059
-514
lines changed

26 files changed

+1059
-514
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ axum = { version = "0.8.6", features = ["http2", "macros"] }
6767
axum-server = { version = "0.7.2", features = ["tls-rustls-no-provider"] }
6868
backoff = "0.4.0"
6969
base64 = "0.22.1"
70-
base64-url = "3.0.0"
70+
base64-url = "3.0.2"
7171
base64ct = { version = "1.8.0", features = ["alloc", "std"] }
7272
bd-workspace-hack = "0.1.0"
7373
bincode = { version = "2.0.1", features = ["serde"] }
7474
bindgen = "0.72.1"
7575
bytes = "1.10.1"
76-
cbindgen = "0.29.0"
77-
cc = "1.2.39"
78-
clap = { version = "4.5.48", features = ["derive", "env"] }
76+
cbindgen = "0.29.2"
77+
cc = "1.2.43"
78+
clap = { version = "4.5.51", features = ["derive", "env"] }
7979
cmake = "0.1.54"
80-
color-backtrace = "0.7.1"
80+
color-backtrace = "0.7.2"
8181
concat-string = "1.0.1"
8282
crc32fast = "1.5.0"
83-
ctor = "0.5.0"
83+
ctor = "0.6.0"
8484
dashmap = "6.1.0"
8585
flatbuffers = "25.9.23"
8686
flatc-rust = "0.2.0"
87-
flate2 = { version = "1.1.2", default-features = false }
87+
flate2 = { version = "1.1.5", default-features = false }
8888
fs2 = "0.4.3"
8989
futures = "0.3.31"
9090
futures-core = "0.3.31"
@@ -104,17 +104,17 @@ insta = "1.43.2"
104104
intrusive-collections = "0.9.7"
105105
itertools = "0.14.0"
106106
jni = "0.21.1"
107-
libc = "0.2.176"
107+
libc = "0.2.177"
108108
libfuzzer-sys = "0.4.10"
109109
log = "0.4.28"
110110
matches = "0.1.10"
111-
memmap2 = "0.9.8"
111+
memmap2 = "0.9.9"
112112
mockall = "0.13.1"
113113
nom = "8.0.0"
114114
nom-language = "0.1.0"
115115
notify = "8.2.0"
116116
parameterized = "2.0.0"
117-
parking_lot = "0.12.4"
117+
parking_lot = "0.12.5"
118118
pretty_assertions = "1.4.1"
119119
prometheus = "0.14.0"
120120
thread_local = "1.1"
@@ -130,8 +130,8 @@ protobuf-codegen = { git = "https://github.com/bitdriftlabs/rust-protobuf.git",
130130
protobuf-json-mapping = { git = "https://github.com/bitdriftlabs/rust-protobuf.git", branch = "patch-stack" }
131131

132132
rand = "0.9.2"
133-
regex = "1.11.3"
134-
reqwest = { version = "0.12.23", features = ["deflate"] }
133+
regex = "1.12.2"
134+
reqwest = { version = "0.12.24", features = ["deflate"] }
135135
rstest = "0.26.1"
136136
serde = { version = "1", features = ["derive", "rc"] }
137137
serde_json = "1.0.145"
@@ -147,9 +147,9 @@ tarpc = { version = "0.37.0", features = ["full"] }
147147
tempfile = "3.23.0"
148148
termcolor = "1.4.1"
149149
thiserror = "2.0.17"
150-
tikv-jemalloc-ctl = "0.6.0"
150+
tikv-jemalloc-ctl = "0.6.1"
151151
time = { version = "0.3.44", features = ["serde-well-known", "macros", "parsing"] }
152-
tokio = { version = "1.47.1", features = ["full", "test-util"] }
152+
tokio = { version = "1.48.0", features = ["full", "test-util"] }
153153
tokio-stream = "0.1.17"
154154
tokio-test = "0.4.4"
155155
tower = { version = "0.5.2", features = ["retry", "util"] }

bd-api/src/api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ impl Api {
590590
.iter()
591591
.map(|(k, v)| {
592592
(
593-
k.to_string(),
593+
k.clone(),
594594
ProtoData {
595595
data_type: Some(Data_type::StringData(v.clone())),
596596
..Default::default()

bd-artifact-upload/src/uploader.rs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,7 @@ impl Uploader {
590590

591591
#[cfg(test)]
592592
if let Some(hooks) = &self.test_hooks {
593-
hooks
594-
.entry_received_tx
595-
.send(uuid.to_string())
596-
.await
597-
.unwrap();
593+
hooks.entry_received_tx.send(uuid.clone()).await.unwrap();
598594
}
599595
return;
600596
},
@@ -606,11 +602,7 @@ impl Uploader {
606602

607603
#[cfg(test)]
608604
if let Some(hooks) = &self.test_hooks {
609-
hooks
610-
.entry_received_tx
611-
.send(uuid.to_string())
612-
.await
613-
.unwrap();
605+
hooks.entry_received_tx.send(uuid.clone()).await.unwrap();
614606
}
615607
return;
616608
}
@@ -668,11 +660,7 @@ impl Uploader {
668660

669661
#[cfg(test)]
670662
if let Some(hooks) = &self.test_hooks {
671-
hooks
672-
.entry_received_tx
673-
.send(uuid.to_string())
674-
.await
675-
.unwrap();
663+
hooks.entry_received_tx.send(uuid.clone()).await.unwrap();
676664
}
677665
}
678666

@@ -766,8 +754,8 @@ impl Uploader {
766754
upload_uuid.clone(),
767755
UploadArtifactIntentRequest {
768756
type_id: "client_report".to_string(),
769-
artifact_id: id.to_string(),
770-
intent_uuid: upload_uuid.to_string(),
757+
artifact_id: id.clone(),
758+
intent_uuid: upload_uuid.clone(),
771759
time: timestamp.into_proto(),
772760
// TODO(snowp): Figure out how to send relevant metadata about the artifact here.
773761
metadata: vec![],

bd-bonjson/src/decoder_test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ fn test_value_none_removed_partial_errors() {
10531053

10541054
#[test]
10551055
fn test_all_variants() {
1056-
let all_value_types = vec![
1056+
let all_value_types = [
10571057
Value::Null,
10581058
Value::Bool(true),
10591059
Value::Float(std::f64::consts::PI),

bd-device/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl Device {
4949

5050
#[allow(clippy::option_if_let_else)]
5151
if let Some(id) = guard.as_ref() {
52-
id.to_string()
52+
id.clone()
5353
} else {
5454
let id = self.store.get(&DEVICE_ID_KEY).map_or_else(
5555
|| {

bd-feature-flags/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl FeatureFlag {
106106
if s.is_empty() {
107107
None
108108
} else {
109-
Some(s.to_string())
109+
Some(s.clone())
110110
}
111111
},
112112
_ => return None,

bd-log-filter/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ impl SetField {
287287

288288
// Get the desired new value for the field.
289289
let value = match &self.value {
290-
SetFieldValue::StringValue(value) => value.to_string(),
290+
SetFieldValue::StringValue(value) => value.clone(),
291291
SetFieldValue::ExistingField(field_name) => {
292292
let Some(value) = extract_value(log, field_name) else {
293293
// The field to copy from doesn't exist, the transform is a no-op.

bd-logger/src/app_version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ impl AppVersionExtra {
4444

4545
pub(crate) fn string_value(&self) -> String {
4646
match self {
47-
Self::BuildNumber(value) => value.to_string(),
47+
Self::BuildNumber(value) => value.clone(),
4848
Self::AppVersionCode(value) => value.to_string(),
4949
}
5050
}

0 commit comments

Comments
 (0)