difftreelog
style fix clippy warnings
in: trunk
5 files changed
crates/fleet-base/src/deploy.rsdiffbeforeafterboth--- a/crates/fleet-base/src/deploy.rs
+++ b/crates/fleet-base/src/deploy.rs
@@ -235,17 +235,12 @@
error!("failed to disarm rollback run: {e}");
}
}
- } else {
- match host
- .rm_file("/etc/fleet_rollback_marker", true)
- .in_current_span()
- .await
- {
- Err(_e) => {
- // Marker might not exist, yet better try to remove it.
- }
- _ => {}
- }
+ } else if let Err(_e) = host
+ .rm_file("/etc/fleet_rollback_marker", true)
+ .in_current_span()
+ .await
+ {
+ // Marker might not exist, yet better try to remove it.
}
}
Ok(())
crates/fleet-base/src/host.rsdiffbeforeafterboth--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -214,13 +214,11 @@
pub fn set_session_destination(&self, dest: String) {
self.session_destination
.set(dest)
- .ok()
.expect("session destination is already set")
}
pub fn set_deploy_kind(&self, kind: DeployKind) {
self.deploy_kind
.set(kind)
- .ok()
.expect("deploy kind is already set");
}
pub async fn deploy_kind(&self) -> Result<DeployKind> {
@@ -568,6 +566,7 @@
local: true,
session: OnceLock::new(),
deploy_kind: OnceCell::new(),
+ session_destination: OnceCell::new(),
}
}
@@ -588,6 +587,7 @@
local: self.localhost == name,
session: OnceLock::new(),
deploy_kind: OnceCell::new(),
+ session_destination: OnceCell::new(),
})
}
pub async fn list_hosts(&self) -> Result<Vec<ConfigHost>> {
crates/fleet-shared/src/encoding.rsdiffbeforeafterboth--- a/crates/fleet-shared/src/encoding.rs
+++ b/crates/fleet-shared/src/encoding.rs
@@ -51,10 +51,10 @@
};
let data = if let Some(unprefixed) = string.strip_prefix(BASE64_ENCODED_PREFIX) {
STANDARD_NO_PAD
- .decode(unprefixed.replace(|v| matches!(v, '\n' | '\t' | ' '), ""))
+ .decode(unprefixed.replace(['\n', '\t', ' '], ""))
.map_err(|e| format!("base64-encoded failed: {e}"))?
} else if let Some(unprefixed) = string.strip_prefix(Z85_ENCODED_PREFIX) {
- z85::decode(unprefixed.replace(|v| matches!(v, '\n' | '\t' | ' '), ""))
+ z85::decode(unprefixed.replace(['\n', '\t', ' '], ""))
.map_err(|e| format!("z85-encoded failed: {e}"))?
} else if let Some(unprefixed) = string.strip_prefix(PLAINTEXT_NEWLINE_PREFIX) {
unprefixed.as_bytes().to_owned()
crates/nixlike/src/lib.rsdiffbeforeafterboth--- a/crates/nixlike/src/lib.rs
+++ b/crates/nixlike/src/lib.rs
@@ -138,7 +138,7 @@
}
}
- let key = k.into_iter().last().unwrap();
+ let key = k.into_iter().next_back().unwrap();
if map.contains_key(&key) {
return Err("can't override object");
}
crates/nixlike/src/se_impl.rsdiffbeforeafterboth1use std::convert::TryInto;23use linked_hash_map::LinkedHashMap;4use serde::{5 Serializer,6 ser::{7 self, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,8 SerializeTupleStruct, SerializeTupleVariant,9 },10};1112use crate::{Error, Value};1314impl ser::Error for Error {15 fn custom<T>(msg: T) -> Self16 where17 T: std::fmt::Display,18 {19 Self::Custom(format!("{}", msg))20 }21}2223pub struct MySerializeSeq(Vec<Value>);2425impl SerializeSeq for MySerializeSeq {26 type Ok = Value;2728 type Error = Error;2930 fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>31 where32 T: serde::Serialize,33 {34 self.0.push(value.serialize(MySerialize)?);35 Ok(())36 }3738 fn end(self) -> Result<Self::Ok, Self::Error> {39 Ok(Value::Array(self.0))40 }41}42impl SerializeTuple for MySerializeSeq {43 type Ok = Value;4445 type Error = Error;4647 fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>48 where49 T: serde::Serialize,50 {51 self.0.push(value.serialize(MySerialize)?);52 Ok(())53 }5455 fn end(self) -> Result<Self::Ok, Self::Error> {56 Ok(Value::Array(self.0))57 }58}59impl SerializeTupleStruct for MySerializeSeq {60 type Ok = Value;6162 type Error = Error;6364 fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>65 where66 T: serde::Serialize,67 {68 self.0.push(value.serialize(MySerialize)?);69 Ok(())70 }7172 fn end(self) -> Result<Self::Ok, Self::Error> {73 Ok(Value::Array(self.0))74 }75}7677pub struct MySerializeSeqVariant(String, MySerializeSeq);7879impl SerializeTupleVariant for MySerializeSeqVariant {80 type Ok = Value;8182 type Error = Error;8384 fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>85 where86 T: serde::Serialize,87 {88 self.1.serialize_field(value)89 }9091 fn end(self) -> Result<Self::Ok, Self::Error> {92 Ok(Value::Object(93 vec![(self.0, Value::Array(self.1.0))].into_iter().collect(),94 ))95 }96}9798pub struct MySerializeMap(LinkedHashMap<String, Value>, Option<String>);99100impl SerializeMap for MySerializeMap {101 type Ok = Value;102103 type Error = Error;104105 fn serialize_key<T: ?Sized>(&mut self, key: &T) -> Result<(), Self::Error>106 where107 T: serde::Serialize,108 {109 let _ = self110 .1111 .insert(key.serialize(MySerialize)?.parse_string()?.to_owned());112 Ok(())113 }114115 fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>116 where117 T: serde::Serialize,118 {119 self.0120 .insert(self.1.take().unwrap(), value.serialize(MySerialize)?);121 Ok(())122 }123124 fn end(self) -> Result<Self::Ok, Self::Error> {125 Ok(Value::Object(self.0))126 }127}128129pub struct MySerializeStruct(LinkedHashMap<String, Value>);130131impl SerializeStruct for MySerializeStruct {132 type Ok = Value;133134 type Error = Error;135136 fn serialize_field<T: ?Sized>(&mut self, key: &str, value: &T) -> Result<(), Self::Error>137 where138 T: serde::Serialize,139 {140 self.0.insert(key.to_owned(), value.serialize(MySerialize)?);141 Ok(())142 }143144 fn end(self) -> Result<Self::Ok, Self::Error> {145 Ok(Value::Object(self.0))146 }147}148149pub struct MySerializeStructVariant(String, LinkedHashMap<String, Value>);150151impl SerializeStructVariant for MySerializeStructVariant {152 type Ok = Value;153154 type Error = Error;155156 fn serialize_field<T: ?Sized>(157 &mut self,158 key: &'static str,159 value: &T,160 ) -> Result<(), Self::Error>161 where162 T: serde::Serialize,163 {164 self.1.insert(key.to_owned(), value.serialize(MySerialize)?);165 Ok(())166 }167168 fn end(self) -> Result<Self::Ok, Self::Error> {169 Ok(Value::Object(170 vec![(self.0, Value::Object(self.1))].into_iter().collect(),171 ))172 }173}174175pub struct MySerialize;176177impl Serializer for MySerialize {178 type Ok = Value;179180 type Error = Error;181182 type SerializeSeq = MySerializeSeq;183184 type SerializeTuple = MySerializeSeq;185186 type SerializeTupleStruct = MySerializeSeq;187188 type SerializeTupleVariant = MySerializeSeqVariant;189190 type SerializeMap = MySerializeMap;191192 type SerializeStruct = MySerializeStruct;193194 type SerializeStructVariant = MySerializeStructVariant;195196 fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {197 Ok(Value::Boolean(v))198 }199200 fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {201 Ok(Value::Number(v as i64))202 }203204 fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {205 Ok(Value::Number(v as i64))206 }207208 fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {209 Ok(Value::Number(v as i64))210 }211212 fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {213 Ok(Value::Number(v))214 }215216 fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {217 Ok(Value::Number(v as i64))218 }219220 fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {221 Ok(Value::Number(v as i64))222 }223224 fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {225 Ok(Value::Number(v as i64))226 }227228 fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {229 Ok(Value::Number(v.try_into().map_err(|_| Error::BadNumber)?))230 }231232 fn serialize_f32(self, _v: f32) -> Result<Self::Ok, Self::Error> {233 todo!()234 }235236 fn serialize_f64(self, _v: f64) -> Result<Self::Ok, Self::Error> {237 todo!()238 }239240 fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {241 Ok(Value::String(v.to_string()))242 }243244 fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {245 Ok(Value::String(v.to_owned()))246 }247248 fn serialize_bytes(self, _v: &[u8]) -> Result<Self::Ok, Self::Error> {249 todo!()250 }251252 fn serialize_none(self) -> Result<Self::Ok, Self::Error> {253 Ok(Value::Null)254 }255256 fn serialize_some<T: ?Sized>(self, value: &T) -> Result<Self::Ok, Self::Error>257 where258 T: serde::Serialize,259 {260 value.serialize(self)261 }262263 fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {264 Ok(Value::Null)265 }266267 fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {268 self.serialize_unit()269 }270271 fn serialize_unit_variant(272 self,273 _name: &'static str,274 _variant_index: u32,275 variant: &'static str,276 ) -> Result<Self::Ok, Self::Error> {277 Ok(Value::String(variant.to_string()))278 }279280 fn serialize_newtype_struct<T: ?Sized>(281 self,282 _name: &'static str,283 value: &T,284 ) -> Result<Self::Ok, Self::Error>285 where286 T: serde::Serialize,287 {288 value.serialize(self)289 }290291 fn serialize_newtype_variant<T: ?Sized>(292 self,293 _name: &'static str,294 _variant_index: u32,295 variant: &'static str,296 value: &T,297 ) -> Result<Self::Ok, Self::Error>298 where299 T: serde::Serialize,300 {301 Ok(Value::Object(302 vec![(variant.to_string(), value.serialize(self)?)]303 .into_iter()304 .collect(),305 ))306 }307308 fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {309 Ok(MySerializeSeq(Vec::with_capacity(len.unwrap_or_default())))310 }311312 fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {313 Ok(MySerializeSeq(Vec::with_capacity(len)))314 }315316 fn serialize_tuple_struct(317 self,318 _name: &'static str,319 len: usize,320 ) -> Result<Self::SerializeTupleStruct, Self::Error> {321 Ok(MySerializeSeq(Vec::with_capacity(len)))322 }323324 fn serialize_tuple_variant(325 self,326 _name: &'static str,327 _variant_index: u32,328 variant: &'static str,329 len: usize,330 ) -> Result<Self::SerializeTupleVariant, Self::Error> {331 Ok(MySerializeSeqVariant(332 variant.to_owned(),333 MySerializeSeq(Vec::with_capacity(len)),334 ))335 }336337 fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {338 Ok(MySerializeMap(LinkedHashMap::new(), None))339 }340341 fn serialize_struct(342 self,343 _name: &'static str,344 _len: usize,345 ) -> Result<Self::SerializeStruct, Self::Error> {346 Ok(MySerializeStruct(LinkedHashMap::new()))347 }348349 fn serialize_struct_variant(350 self,351 _name: &'static str,352 _variant_index: u32,353 variant: &'static str,354 _len: usize,355 ) -> Result<Self::SerializeStructVariant, Self::Error> {356 Ok(MySerializeStructVariant(357 variant.to_owned(),358 LinkedHashMap::new(),359 ))360 }361}1use std::convert::TryInto;23use linked_hash_map::LinkedHashMap;4use serde::{5 Serializer,6 ser::{7 self, SerializeMap, SerializeSeq, SerializeStruct, SerializeStructVariant, SerializeTuple,8 SerializeTupleStruct, SerializeTupleVariant,9 },10};1112use crate::{Error, Value};1314impl ser::Error for Error {15 fn custom<T>(msg: T) -> Self16 where17 T: std::fmt::Display,18 {19 Self::Custom(format!("{}", msg))20 }21}2223pub struct MySerializeSeq(Vec<Value>);2425impl SerializeSeq for MySerializeSeq {26 type Ok = Value;2728 type Error = Error;2930 fn serialize_element<T>(&mut self, value: &T) -> Result<(), Self::Error>31 where32 T: serde::Serialize,33 T: ?Sized,34 {35 self.0.push(value.serialize(MySerialize)?);36 Ok(())37 }3839 fn end(self) -> Result<Self::Ok, Self::Error> {40 Ok(Value::Array(self.0))41 }42}43impl SerializeTuple for MySerializeSeq {44 type Ok = Value;4546 type Error = Error;4748 fn serialize_element<T>(&mut self, value: &T) -> Result<(), Self::Error>49 where50 T: serde::Serialize,51 T: ?Sized,52 {53 self.0.push(value.serialize(MySerialize)?);54 Ok(())55 }5657 fn end(self) -> Result<Self::Ok, Self::Error> {58 Ok(Value::Array(self.0))59 }60}61impl SerializeTupleStruct for MySerializeSeq {62 type Ok = Value;6364 type Error = Error;6566 fn serialize_field<T>(&mut self, value: &T) -> Result<(), Self::Error>67 where68 T: serde::Serialize,69 T: ?Sized,70 {71 self.0.push(value.serialize(MySerialize)?);72 Ok(())73 }7475 fn end(self) -> Result<Self::Ok, Self::Error> {76 Ok(Value::Array(self.0))77 }78}7980pub struct MySerializeSeqVariant(String, MySerializeSeq);8182impl SerializeTupleVariant for MySerializeSeqVariant {83 type Ok = Value;8485 type Error = Error;8687 fn serialize_field<T>(&mut self, value: &T) -> Result<(), Self::Error>88 where89 T: serde::Serialize,90 T: ?Sized,91 {92 self.1.serialize_field(value)93 }9495 fn end(self) -> Result<Self::Ok, Self::Error> {96 Ok(Value::Object(97 vec![(self.0, Value::Array(self.1.0))].into_iter().collect(),98 ))99 }100}101102pub struct MySerializeMap(LinkedHashMap<String, Value>, Option<String>);103104impl SerializeMap for MySerializeMap {105 type Ok = Value;106107 type Error = Error;108109 fn serialize_key<T>(&mut self, key: &T) -> Result<(), Self::Error>110 where111 T: serde::Serialize,112 T: ?Sized,113 {114 let _ = self115 .1116 .insert(key.serialize(MySerialize)?.parse_string()?.to_owned());117 Ok(())118 }119120 fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>121 where122 T: serde::Serialize,123 T: ?Sized,124 {125 self.0126 .insert(self.1.take().unwrap(), value.serialize(MySerialize)?);127 Ok(())128 }129130 fn end(self) -> Result<Self::Ok, Self::Error> {131 Ok(Value::Object(self.0))132 }133}134135pub struct MySerializeStruct(LinkedHashMap<String, Value>);136137impl SerializeStruct for MySerializeStruct {138 type Ok = Value;139140 type Error = Error;141142 fn serialize_field<T>(&mut self, key: &str, value: &T) -> Result<(), Self::Error>143 where144 T: serde::Serialize,145 T: ?Sized,146 {147 self.0.insert(key.to_owned(), value.serialize(MySerialize)?);148 Ok(())149 }150151 fn end(self) -> Result<Self::Ok, Self::Error> {152 Ok(Value::Object(self.0))153 }154}155156pub struct MySerializeStructVariant(String, LinkedHashMap<String, Value>);157158impl SerializeStructVariant for MySerializeStructVariant {159 type Ok = Value;160161 type Error = Error;162163 fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>164 where165 T: serde::Serialize,166 T: ?Sized,167 {168 self.1.insert(key.to_owned(), value.serialize(MySerialize)?);169 Ok(())170 }171172 fn end(self) -> Result<Self::Ok, Self::Error> {173 Ok(Value::Object(174 vec![(self.0, Value::Object(self.1))].into_iter().collect(),175 ))176 }177}178179pub struct MySerialize;180181impl Serializer for MySerialize {182 type Ok = Value;183184 type Error = Error;185186 type SerializeSeq = MySerializeSeq;187188 type SerializeTuple = MySerializeSeq;189190 type SerializeTupleStruct = MySerializeSeq;191192 type SerializeTupleVariant = MySerializeSeqVariant;193194 type SerializeMap = MySerializeMap;195196 type SerializeStruct = MySerializeStruct;197198 type SerializeStructVariant = MySerializeStructVariant;199200 fn serialize_bool(self, v: bool) -> Result<Self::Ok, Self::Error> {201 Ok(Value::Boolean(v))202 }203204 fn serialize_i8(self, v: i8) -> Result<Self::Ok, Self::Error> {205 Ok(Value::Number(v as i64))206 }207208 fn serialize_i16(self, v: i16) -> Result<Self::Ok, Self::Error> {209 Ok(Value::Number(v as i64))210 }211212 fn serialize_i32(self, v: i32) -> Result<Self::Ok, Self::Error> {213 Ok(Value::Number(v as i64))214 }215216 fn serialize_i64(self, v: i64) -> Result<Self::Ok, Self::Error> {217 Ok(Value::Number(v))218 }219220 fn serialize_u8(self, v: u8) -> Result<Self::Ok, Self::Error> {221 Ok(Value::Number(v as i64))222 }223224 fn serialize_u16(self, v: u16) -> Result<Self::Ok, Self::Error> {225 Ok(Value::Number(v as i64))226 }227228 fn serialize_u32(self, v: u32) -> Result<Self::Ok, Self::Error> {229 Ok(Value::Number(v as i64))230 }231232 fn serialize_u64(self, v: u64) -> Result<Self::Ok, Self::Error> {233 Ok(Value::Number(v.try_into().map_err(|_| Error::BadNumber)?))234 }235236 fn serialize_f32(self, _v: f32) -> Result<Self::Ok, Self::Error> {237 todo!()238 }239240 fn serialize_f64(self, _v: f64) -> Result<Self::Ok, Self::Error> {241 todo!()242 }243244 fn serialize_char(self, v: char) -> Result<Self::Ok, Self::Error> {245 Ok(Value::String(v.to_string()))246 }247248 fn serialize_str(self, v: &str) -> Result<Self::Ok, Self::Error> {249 Ok(Value::String(v.to_owned()))250 }251252 fn serialize_bytes(self, _v: &[u8]) -> Result<Self::Ok, Self::Error> {253 todo!()254 }255256 fn serialize_none(self) -> Result<Self::Ok, Self::Error> {257 Ok(Value::Null)258 }259260 fn serialize_some<T>(self, value: &T) -> Result<Self::Ok, Self::Error>261 where262 T: serde::Serialize,263 T: ?Sized,264 {265 value.serialize(self)266 }267268 fn serialize_unit(self) -> Result<Self::Ok, Self::Error> {269 Ok(Value::Null)270 }271272 fn serialize_unit_struct(self, _name: &'static str) -> Result<Self::Ok, Self::Error> {273 self.serialize_unit()274 }275276 fn serialize_unit_variant(277 self,278 _name: &'static str,279 _variant_index: u32,280 variant: &'static str,281 ) -> Result<Self::Ok, Self::Error> {282 Ok(Value::String(variant.to_string()))283 }284285 fn serialize_newtype_struct<T>(286 self,287 _name: &'static str,288 value: &T,289 ) -> Result<Self::Ok, Self::Error>290 where291 T: serde::Serialize,292 T: ?Sized,293 {294 value.serialize(self)295 }296297 fn serialize_newtype_variant<T>(298 self,299 _name: &'static str,300 _variant_index: u32,301 variant: &'static str,302 value: &T,303 ) -> Result<Self::Ok, Self::Error>304 where305 T: serde::Serialize,306 T: ?Sized,307 {308 Ok(Value::Object(309 vec![(variant.to_string(), value.serialize(self)?)]310 .into_iter()311 .collect(),312 ))313 }314315 fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, Self::Error> {316 Ok(MySerializeSeq(Vec::with_capacity(len.unwrap_or_default())))317 }318319 fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, Self::Error> {320 Ok(MySerializeSeq(Vec::with_capacity(len)))321 }322323 fn serialize_tuple_struct(324 self,325 _name: &'static str,326 len: usize,327 ) -> Result<Self::SerializeTupleStruct, Self::Error> {328 Ok(MySerializeSeq(Vec::with_capacity(len)))329 }330331 fn serialize_tuple_variant(332 self,333 _name: &'static str,334 _variant_index: u32,335 variant: &'static str,336 len: usize,337 ) -> Result<Self::SerializeTupleVariant, Self::Error> {338 Ok(MySerializeSeqVariant(339 variant.to_owned(),340 MySerializeSeq(Vec::with_capacity(len)),341 ))342 }343344 fn serialize_map(self, _len: Option<usize>) -> Result<Self::SerializeMap, Self::Error> {345 Ok(MySerializeMap(LinkedHashMap::new(), None))346 }347348 fn serialize_struct(349 self,350 _name: &'static str,351 _len: usize,352 ) -> Result<Self::SerializeStruct, Self::Error> {353 Ok(MySerializeStruct(LinkedHashMap::new()))354 }355356 fn serialize_struct_variant(357 self,358 _name: &'static str,359 _variant_index: u32,360 variant: &'static str,361 _len: usize,362 ) -> Result<Self::SerializeStructVariant, Self::Error> {363 Ok(MySerializeStructVariant(364 variant.to_owned(),365 LinkedHashMap::new(),366 ))367 }368}