summaryrefslogtreecommitdiffstats
path: root/imag-counter
diff options
context:
space:
mode:
authorAndre Bogus <bogusandre@gmail.com>2016-05-03 00:57:41 +0200
committerAndre Bogus <bogusandre@gmail.com>2016-05-13 22:26:48 +0200
commitdfd6a9b0d370b841d6591e0d292bc5c7fa2fe76f (patch)
tree6cb460272b335f5a2f933ca519878ad9d8fd9098 /imag-counter
parent0c89fafe209505acd72f787bda16bcdb9a249457 (diff)
style adaptations
these were introduced following suggestions from https://crates.io/crate/clippy
Diffstat (limited to 'imag-counter')
-rw-r--r--imag-counter/src/create.rs2
-rw-r--r--imag-counter/src/interactive.rs12
-rw-r--r--imag-counter/src/list.rs9
3 files changed, 10 insertions, 13 deletions
diff --git a/imag-counter/src/create.rs b/imag-counter/src/create.rs
index 66f6590d..1b2838a5 100644
--- a/imag-counter/src/create.rs
+++ b/imag-counter/src/create.rs
@@ -17,7 +17,7 @@ pub fn create(rt: &Runtime) {
.and_then(|i| FromStr::from_str(i).ok())
.unwrap_or(0);
- match Counter::new(rt.store(), String::from(name.clone()), init) {
+ match Counter::new(rt.store(), String::from(name), init) {
Err(e) => {
warn!("Could not create Counter '{}' with initial value '{}'", name, init);
trace_error(&e);
diff --git a/imag-counter/src/interactive.rs b/imag-counter/src/interactive.rs
index 03e6b40e..5a2b1e01 100644
--- a/imag-counter/src/interactive.rs
+++ b/imag-counter/src/interactive.rs
@@ -51,7 +51,7 @@ pub fn interactive(rt: &Runtime) {
exit(1);
}
- let cont = if input.len() > 0 {
+ let cont = if !input.is_empty() {
let increment = match input.chars().next() { Some('-') => false, _ => true };
input.chars().all(|chr| {
match pairs.get_mut(&chr) {
@@ -94,8 +94,8 @@ pub fn interactive(rt: &Runtime) {
fn has_quit_binding(pairs: &BTreeMap<char, Binding>) -> bool {
pairs.iter()
.any(|(_, bind)| {
- match bind {
- &Binding::Function(ref name, _) => name == "quit",
+ match *bind {
+ Binding::Function(ref name, _) => name == "quit",
_ => false,
}
})
@@ -109,8 +109,8 @@ enum Binding<'a> {
impl<'a> Display for Binding<'a> {
fn fmt(&self, fmt: &mut Formatter) -> RResult<(), Error> {
- match self {
- &Binding::Counter(ref c) => {
+ match *self {
+ Binding::Counter(ref c) => {
match c.name() {
Ok(name) => {
try!(write!(fmt, "{}", name));
@@ -122,7 +122,7 @@ impl<'a> Display for Binding<'a> {
},
}
},
- &Binding::Function(ref name, _) => write!(fmt, "{}()", name),
+ Binding::Function(ref name, _) => write!(fmt, "{}()", name),
}
}
diff --git a/imag-counter/src/list.rs b/imag-counter/src/list.rs
index b7276957..41e9ce62 100644
--- a/imag-counter/src/list.rs
+++ b/imag-counter/src/list.rs
@@ -16,13 +16,10 @@ pub fn list(rt: &Runtime) {
if name.is_err() {
trace_error(&name.unwrap_err());
+ } else if value.is_err() {
+ trace_error(&value.unwrap_err());
} else {
-
- if value.is_err() {
- trace_error(&value.unwrap_err());
- } else {
- println!("{} - {}", name.unwrap(), value.unwrap());
- }
+ println!("{} - {}", name.unwrap(), value.unwrap());
}
})
.map_err(|e| trace_error(&e))