Cargo fmt and update

NGnius · Mar 16, 2022 · 494537a · 494537a
1 parent 2e75abd
commit 494537a
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mps-interpreter/src/errors.rs b/mps-interpreter/src/errors.rs
@@ -1,7 +1,7 @@
-use std::fmt::{Debug, Display, Error, Formatter};
 use std::convert::From;
+use std::fmt::{Debug, Display, Error, Formatter};
 
-use crate::lang::{SyntaxError, RuntimeError, MpsLanguageError};
+use crate::lang::{MpsLanguageError, RuntimeError, SyntaxError};
 use crate::tokens::ParseError;
 
 #[derive(Debug)]

diff --git a/mps-interpreter/src/interpretor.rs b/mps-interpreter/src/interpretor.rs
@@ -6,8 +6,8 @@ use std::path::Path;
 use super::lang::{MpsLanguageDictionary, MpsLanguageError, MpsOp};
 use super::tokens::MpsToken;
 use super::MpsContext;
-use super::MpsItem;
 use super::MpsError;
+use super::MpsItem;
 
 /// The script interpreter.
 /// Use MpsRunner for a better interface.
@@ -91,8 +91,7 @@ where
             if next_item.is_none() {
                 is_stmt_done = true;
             }
-            next_item
-                .map(|item| item.map_err(|e| error_with_ctx(e, self.tokenizer.current_line())))
+            next_item.map(|item| item.map_err(|e| error_with_ctx(e, self.tokenizer.current_line())))
         } else {
             /*if self.tokenizer.end_of_file() {
                 return None;

diff --git a/mps-interpreter/src/lang/iter_block.rs b/mps-interpreter/src/lang/iter_block.rs
@@ -347,12 +347,12 @@ fn find_last_open_curly(tokens: &VecDeque<MpsToken>) -> Option<usize> {
                 if bracket_depth == 0 && curly_found {
                     return Some(i + 1);
                 }
-            },
+            }
             MpsToken::OpenBracket | MpsToken::CloseBracket => {
                 if bracket_depth == 0 {
                     return None;
                 }
-            },
+            }
             _ => {}
         }
         if token.is_open_curly() {

diff --git a/mps-interpreter/src/lang/mod.rs b/mps-interpreter/src/lang/mod.rs
@@ -16,8 +16,8 @@ mod type_primitives;
 pub(crate) mod utility;
 
 pub use dictionary::MpsLanguageDictionary;
-pub use error::{RuntimeError, RuntimeMsg, RuntimeOp, SyntaxError};
 pub(crate) use error::MpsLanguageError;
+pub use error::{RuntimeError, RuntimeMsg, RuntimeOp, SyntaxError};
 pub use filter::{
     MpsFilterFactory, MpsFilterPredicate, MpsFilterStatement, MpsFilterStatementFactory,
 };

diff --git a/mps-interpreter/src/runner.rs b/mps-interpreter/src/runner.rs
@@ -3,7 +3,7 @@ use std::iter::Iterator;
 
 use super::lang::MpsLanguageDictionary;
 use super::tokens::{MpsTokenReader, MpsTokenizer};
-use super::{MpsContext, MpsInterpretor, MpsItem, MpsError};
+use super::{MpsContext, MpsError, MpsInterpretor, MpsItem};
 
 pub struct MpsRunnerSettings<T: MpsTokenReader> {
     pub vocabulary: MpsLanguageDictionary,

diff --git a/mps-interpreter/tests/single_line.rs b/mps-interpreter/tests/single_line.rs
@@ -1,5 +1,5 @@
-use mps_interpreter::MpsError;
 use mps_interpreter::tokens::{MpsToken, MpsTokenizer, ParseError};
+use mps_interpreter::MpsError;
 use mps_interpreter::*;
 use std::collections::VecDeque;
 use std::io::Cursor;

diff --git a/mps-player/src/os_controls.rs b/mps-player/src/os_controls.rs
@@ -179,7 +179,10 @@ impl SystemControlWrapper {
 
     fn enqueued(item: MpsItem, dbus_ctrl: &Sender<DbusControl>) {
         //println!("Got enqueued item {}", &item.title);
-        let file_uri = item.field("filename").and_then(|x| x.to_owned().to_str()).map(|x| format!("file://{}", x));
+        let file_uri = item
+            .field("filename")
+            .and_then(|x| x.to_owned().to_str())
+            .map(|x| format!("file://{}", x));
         dbus_ctrl
             .send(DbusControl::SetMetadata(Metadata {
                 length: None,