aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2023-07-14 15:51:44 +0000
committerAlex <alex@adnab.me>2023-07-14 15:51:44 +0000
commit6ba611361e6d3ae701ea211adddbed61ea338da7 (patch)
tree85f90fdd80ee92631cb5816f087126718c3659eb /src
parent7605d0cb117d80e7140812e96264e86a4c987080 (diff)
parentc855284760d4ac198f5acf2ae0e18f98870be98f (diff)
downloadgarage-6ba611361e6d3ae701ea211adddbed61ea338da7.tar.gz
garage-6ba611361e6d3ae701ea211adddbed61ea338da7.zip
Merge pull request 'tree-wide: fix some typos' (#598) from flokli/garage:fix-typos into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/598
Diffstat (limited to 'src')
-rw-r--r--src/garage/cli/structs.rs2
-rw-r--r--src/util/migrate.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/garage/cli/structs.rs b/src/garage/cli/structs.rs
index 01ae92da..6e585e53 100644
--- a/src/garage/cli/structs.rs
+++ b/src/garage/cli/structs.rs
@@ -216,7 +216,7 @@ pub struct WebsiteOpt {
#[structopt(short = "i", long = "index-document", default_value = "index.html")]
pub index_document: String,
- /// Error document: the optionnal document returned when an error occurs
+ /// Error document: the optional document returned when an error occurs
#[structopt(short = "e", long = "error-document")]
pub error_document: Option<String>,
}
diff --git a/src/util/migrate.rs b/src/util/migrate.rs
index 1229fd9c..b9cce08a 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);