Deuxfleurs/garage
41
56
Fork 73
Code Issues 102 Pull requests 14 Releases 30 Wiki Activity

Garage v0.9 #473

Merged
lx merged 175 commits from next into main 2023-10-10 13:28:29 +00:00
Conversation 0 Commits 175 Files changed 120 +646 -505
4 changed files with 646 additions and 505 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit db56d4658f - Show all commits

1137
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
src/util/Cargo.toml
View file

@ -32,7 +32,7 @@ rand = "0.8"
sha2 = "0.10" sha2 = "0.10"
chrono = "0.4" chrono = "0.4"
rmp-serde = "0.15" rmp-serde = "1.1"
serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
serde_json = "1.0" serde_json = "1.0"
toml = "0.5" toml = "0.5"

6
src/util/encode.rs
View file

@ -8,9 +8,7 @@ where
T: Serialize + ?Sized, T: Serialize + ?Sized,
{ {
let mut wr = Vec::with_capacity(128); let mut wr = Vec::with_capacity(128);
let mut se = rmp_serde::Serializer::new(&mut wr) let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map();
.with_struct_map()
.with_string_variants();
val.serialize(&mut se)?; val.serialize(&mut se)?;
Ok(wr) Ok(wr)
} }
@ -22,7 +20,7 @@ pub fn nonversioned_decode<T>(bytes: &[u8]) -> Result<T, rmp_serde::decode::Erro
where where
T: for<'de> Deserialize<'de> + ?Sized, T: for<'de> Deserialize<'de> + ?Sized,
{ {
rmp_serde::decode::from_read_ref::<_, T>(bytes) rmp_serde::decode::from_slice::<_>(bytes)
} }
/// Serialize to JSON, truncating long result /// Serialize to JSON, truncating long result

6
src/util/migrate.rs
View file

@ -19,7 +19,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static {
fn decode(bytes: &[u8]) -> Option<Self> { fn decode(bytes: &[u8]) -> Option<Self> {
let marker_len = Self::VERSION_MARKER.len(); let marker_len = Self::VERSION_MARKER.len();
if bytes.get(..marker_len) == Some(Self::VERSION_MARKER) { if bytes.get(..marker_len) == Some(Self::VERSION_MARKER) {
if let Ok(value) = rmp_serde::decode::from_read_ref::<_, Self>(&bytes[marker_len..]) { if let Ok(value) = rmp_serde::decode::from_slice::<_>(&bytes[marker_len..]) {
return Some(value); return Some(value);
} }
} }
@ -31,9 +31,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static {
fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> { fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> {
let mut wr = Vec::with_capacity(128); let mut wr = Vec::with_capacity(128);
wr.extend_from_slice(Self::VERSION_MARKER); wr.extend_from_slice(Self::VERSION_MARKER);
let mut se = rmp_serde::Serializer::new(&mut wr) let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map();
.with_struct_map()
.with_string_variants();
self.serialize(&mut se)?; self.serialize(&mut se)?;
Ok(wr) Ok(wr)
} }