From 35043094f9e965fcf895f6a1d718b5cc08fbed1b Mon Sep 17 00:00:00 2001
From: Thomas Heck <t@b128.net>
Date: Mon, 28 Dec 2020 15:32:18 +0100
Subject: [PATCH] fix typo

---
 src/main.rs | 12 ++++++------
 src/ui.rs   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index fce1313..d7d390b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -66,17 +66,17 @@ fn gmake<T: IsA<Element>>(factory_name: &str) -> Result<T> {
 }
 
 #[derive(Debug, Clone)]
-pub struct ConvertionArgs {
+pub struct ConversionArgs {
     rel_from_path: PathBuf,
     transcode: config::Transcode,
 }
 
-fn get_convertion_args(config: &Config) -> impl Iterator<Item = Result<ConvertionArgs>> + '_ {
+fn get_conversion_args(config: &Config) -> impl Iterator<Item = Result<ConversionArgs>> + '_ {
     walkdir::WalkDir::new(&config.from)
         .into_iter()
         .filter_map(|e| e.ok())
         .filter(|e| e.file_type().is_file())
-        .map(move |e| -> Result<Option<ConvertionArgs>> {
+        .map(move |e| -> Result<Option<ConversionArgs>> {
             let from_bytes = path_to_bytes(e.path());
 
             let transcode = config
@@ -127,7 +127,7 @@ fn get_convertion_args(config: &Config) -> impl Iterator<Item = Result<Convertio
             };
 
             if is_newer {
-                Ok(Some(ConvertionArgs {
+                Ok(Some(ConversionArgs {
                     rel_from_path: rel_path.to_path_buf(),
                     transcode,
                 }))
@@ -170,7 +170,7 @@ async fn main_loop(ui_queue: ui::MsgQueue) -> Result<()> {
         gstreamer::init()?;
         let config = config::config().context("could not get the config")?;
 
-        let conv_args = get_convertion_args(&config)
+        let conv_args = get_conversion_args(&config)
             .collect::<Result<Vec<_>>>()
             .context("failed loading dir structure")?;
 
@@ -258,7 +258,7 @@ async fn main_loop(ui_queue: ui::MsgQueue) -> Result<()> {
 
 async fn transcode(
     config: &Config,
-    args: &ConvertionArgs,
+    args: &ConversionArgs,
     task_id: usize,
     queue: &ui::MsgQueue,
 ) -> Result<()> {
diff --git a/src/ui.rs b/src/ui.rs
index 996088f..def83a2 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -1,4 +1,4 @@
-use crate::ConvertionArgs;
+use crate::ConversionArgs;
 use anyhow::{Context, Result};
 use futures::Future;
 use std::{
@@ -14,7 +14,7 @@ pub const UPDATE_INTERVAL_MILLIS: u64 = 100;
 pub enum Msg {
     Init { task_len: usize, log_path: PathBuf },
     Exit,
-    TaskStart { id: usize, args: ConvertionArgs },
+    TaskStart { id: usize, args: ConversionArgs },
     TaskEnd { id: usize },
     TaskProgress { id: usize, ratio: f64 },
     TaskError { id: usize },
@@ -232,7 +232,7 @@ impl State {
 struct Task {
     id: usize,
     ratio: Option<f64>,
-    args: ConvertionArgs,
+    args: ConversionArgs,
 }
 
 pub fn init() -> (MsgQueue, impl Future<Output = Result<()>>) {