diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-08-29 11:32:42 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-08-29 11:32:42 +0200 |
| commit | 2e90e1c124ea298de5e613de5a672f7c90ab6704 (patch) | |
| tree | 76d1b50c353048d36e01ffcc8dda2223c0c4545d /src/util | |
| parent | 8ef42c9609bcefc642cc9739acb921dffba49b89 (diff) | |
| parent | 32e5686ad8354a2b2b37807ba6d7add73a6d23ee (diff) | |
| download | garage-2e90e1c124ea298de5e613de5a672f7c90ab6704.tar.gz garage-2e90e1c124ea298de5e613de5a672f7c90ab6704.zip | |
Merge branch 'main' into nextv0.9.0-beta1
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/Cargo.toml | 4 | ||||
| -rw-r--r-- | src/util/migrate.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml index 27ef4550..bf3560f6 100644 --- a/src/util/Cargo.toml +++ b/src/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "garage_util" -version = "0.8.2" +version = "0.8.3" authors = ["Alex Auvolat <alex@adnab.me>"] edition = "2018" license = "AGPL-3.0" @@ -31,7 +31,7 @@ rand = "0.8" sha2 = "0.10" chrono = "0.4" -rmp-serde = "1.1" +rmp-serde = "1.1.2" serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } serde_json = "1.0" toml = "0.6" diff --git a/src/util/migrate.rs b/src/util/migrate.rs index 5b708cc8..45147c74 100644 --- a/src/util/migrate.rs +++ b/src/util/migrate.rs @@ -27,7 +27,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static { Self::Previous::decode(bytes).map(Self::migrate) } - /// Encode this type with optionnal version marker + /// Encode this type with optional version marker fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> { let mut wr = Vec::with_capacity(128); wr.extend_from_slice(Self::VERSION_MARKER); |