diff --git a/src/rest.rs b/src/rest.rs index 06dcf7c..2672f42 100644 --- a/src/rest.rs +++ b/src/rest.rs @@ -84,7 +84,7 @@ impl Service for WebService { .read() .log_expect("InstallerFramework has been dirtied"); - let file = enscapsulate_json( + let file = encapsulate_json( "config", &framework .get_config() @@ -104,7 +104,7 @@ impl Service for WebService { .read() .log_expect("InstallerFramework has been dirtied"); - let file = enscapsulate_json( + let file = encapsulate_json( "packages", &serde_json::to_string(&framework.database) .log_expect("Failed to render JSON representation of database"), @@ -187,7 +187,7 @@ impl Service for WebService { loop { let response = receiver .recv() - .log_expect("Failed to recieve message from runner thread"); + .log_expect("Failed to receive message from runner thread"); if let InstallMessage::EOF = response { break; @@ -254,9 +254,9 @@ impl Service for WebService { } if let Err(v) = framework.install(to_install, &sender, new_install) { - error!("Uninstall error occurred: {:?}", v); + error!("Install error occurred: {:?}", v); if let Err(v) = sender.send(InstallMessage::Error(v)) { - error!("Failed to send uninstall error: {:?}", v); + error!("Failed to send install error: {:?}", v); } } @@ -271,7 +271,7 @@ impl Service for WebService { loop { let response = receiver .recv() - .log_expect("Failed to recieve message from runner thread"); + .log_expect("Failed to receive message from runner thread"); if let InstallMessage::EOF = response { break; @@ -323,6 +323,6 @@ impl Service for WebService { } /// Encapsulates JSON as a injectable Javascript script. -fn enscapsulate_json(field_name: &str, json: &str) -> String { +fn encapsulate_json(field_name: &str, json: &str) -> String { format!("var {} = {};", field_name, json) } diff --git a/src/tasks/mod.rs b/src/tasks/mod.rs index fdb24ca..a03bfc5 100644 --- a/src/tasks/mod.rs +++ b/src/tasks/mod.rs @@ -19,7 +19,7 @@ pub mod save_executable; pub mod uninstall; pub mod uninstall_pkg; -/// An abstraction over the various paramaters that can be passed around. +/// An abstraction over the various parameters that can be passed around. pub enum TaskParamType { None, /// Metadata about a file diff --git a/static/js/helpers.js b/static/js/helpers.js index 338d822..0427991 100644 --- a/static/js/helpers.js +++ b/static/js/helpers.js @@ -53,7 +53,7 @@ function ajax(path, successCallback, failCallback, data) { /** * Makes a AJAX request, streaming each line as it arrives. Type should be text/plain, - * each line will be interpeted as JSON seperately. + * each line will be interpreted as JSON separately. * * @param path The path to connect to. * @param callback A callback with a JSON payload. Called for every line as it comes.