Skip to content

Commit

Permalink
Merge pull request #450 from kianmeng/fix-typos
Browse files Browse the repository at this point in the history
fix typos
  • Loading branch information
soywod authored Jun 13, 2023
2 parents 7d96ca5 + 5a17ae7 commit 5599a1f
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Changed release archive extensions from `.tar.gz` to `.tgz`.
- Moved `wizard` module into domains (config, account, backend…).
- [**BREAKING**] Changed the way secrets are managed. A secret is a sensitive data like passwords or tokens. There is 3 possible ways to declare a secret in the config file:
- `{ raw = <secret> }` for the raw secret as string (unsafe, not recommanded),
- `{ raw = <secret> }` for the raw secret as string (unsafe, not recommended),
- `{ cmd = <secret-cmd> }` for command that exposes the secret,
- `{ keyring = <secret-entry> }` for entry in your system's global keyring that contains the secret.

Expand Down Expand Up @@ -163,7 +163,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separated the CLI from the lib module [#340].

The source code has been splitted into subrepositories:
The source code has been split into subrepositories:

- The email logic has been extracted from the CLI and placed in a lib on [sourcehut](https://git.sr.ht/~soywod/himalaya-lib)
- The vim plugin is now in a dedicated repository on [sourcehut](https://git.sr.ht/~soywod/himalaya-vim) as well
Expand Down
2 changes: 1 addition & 1 deletion src/config/wizard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub(crate) fn configure() -> Result<DeserializedConfig> {
wizard_log!("Configuring another account:");
}

// If one acounts is setup, make it the default. If multiple
// If one account is setup, make it the default. If multiple
// accounts are setup, decide which will be the default. If no
// accounts are setup, exit the process.
let default_account = match config.accounts.len() {
Expand Down
8 changes: 4 additions & 4 deletions src/domain/account/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ pub fn sync<'a, P: Printer>(
.collect::<Vec<_>>();
if !folders_patch_err.is_empty() {
printer.print_log("")?;
printer.print_log("Errors occured while applying the folders patch:")?;
printer.print_log("Errors occurred while applying the folders patch:")?;
folders_patch_err
.iter()
.try_for_each(|(hunk, err)| printer.print_log(format!(" - {hunk}: {err}")))?;
Expand All @@ -241,7 +241,7 @@ pub fn sync<'a, P: Printer>(
if let Some(err) = report.folders_cache_patch.1 {
printer.print_log("")?;
printer.print_log(format!(
"Error occured while applying the folder cache patch: {err}"
"Error occurred while applying the folder cache patch: {err}"
))?;
}

Expand All @@ -252,7 +252,7 @@ pub fn sync<'a, P: Printer>(
.collect::<Vec<_>>();
if !envelopes_patch_err.is_empty() {
printer.print_log("")?;
printer.print_log("Errors occured while applying the envelopes patch:")?;
printer.print_log("Errors occurred while applying the envelopes patch:")?;
for (hunk, err) in folders_patch_err {
printer.print_log(format!(" - {hunk}: {err}"))?;
}
Expand All @@ -261,7 +261,7 @@ pub fn sync<'a, P: Printer>(
if let Some(err) = report.envelopes_cache_patch.1 {
printer.print_log("")?;
printer.print_log(format!(
"Error occured while applying the envelopes cache patch: {err}"
"Error occurred while applying the envelopes cache patch: {err}"
))?;
}

Expand Down
6 changes: 3 additions & 3 deletions src/ui/table/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::printer::{Print, PrintTableOpts, WriteColor};
/// TODO: make this customizable.
pub const DEFAULT_TERM_WIDTH: usize = 80;

/// Defines the minimum size of a shrinked cell.
/// Defines the minimum size of a shrunk cell.
/// TODO: make this customizable.
pub const MAX_SHRINK_WIDTH: usize = 5;

Expand Down Expand Up @@ -237,9 +237,9 @@ where

value.push_str("… ");
trace!("chars width: {}", chars_width);
trace!("shrinked value: {}", value);
trace!("shrunk value: {}", value);
let spaces_count = cell_width - chars_width - 1;
trace!("number of spaces added to shrinked value: {}", spaces_count);
trace!("number of spaces added to shrunk value: {}", spaces_count);
value.push_str(&" ".repeat(spaces_count));
cell.value = value;
} else {
Expand Down

0 comments on commit 5599a1f

Please sign in to comment.