Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extras/CONFIG.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ refresh_time = 1000
# Display directories before files
dirs_first = false
show_hidden_by_default = false
# Whether to show special commads in a fuzzy style. Alternative is a list-like
# Whether to show special commands in a fuzzy style. Alternative is a list-like
# view
special_commands_fuzzy = true

Expand Down
8 changes: 4 additions & 4 deletions src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ where
}

/// Merge two structs against their default. As long as the right-hand merge is not the default,
/// it replaces the left-hande merge.
/// it replaces the left-hand merge.
macro_rules! merge {
($first:expr, $second:expr; $($field:ident),+) => {{
let base = Self::default();
Expand Down Expand Up @@ -816,9 +816,9 @@ impl<'de> Deserialize<'de> for Modifier {
where
D: serde::Deserializer<'de>,
{
struct ModifierVistor;
struct ModifierVisitor;

impl<'de> Visitor<'de> for ModifierVistor {
impl<'de> Visitor<'de> for ModifierVisitor {
type Value = Modifier;

fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
Expand All @@ -841,7 +841,7 @@ impl<'de> Deserialize<'de> for Modifier {
}
}

deserializer.deserialize_seq(ModifierVistor)
deserializer.deserialize_seq(ModifierVisitor)
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ fn main() -> Result<()> {
shut_down();
}

let config = Rc::new(get_config().context("error gettting project root")?);
let config = Rc::new(get_config().context("error getting project root")?);

log::set_logger(&EVENT_LOGGER)
.map(|()| {
Expand Down