summaryrefslogtreecommitdiffstats
path: root/src/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd')
-rw-r--r--src/cmd/mod.rs2
-rw-r--r--src/cmd/sql.rs2
-rw-r--r--src/cmd/sync.rs8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
index 68ae2fb..e793b55 100644
--- a/src/cmd/mod.rs
+++ b/src/cmd/mod.rs
@@ -2,7 +2,7 @@ mod recommend;
mod sql;
mod sync;
-const _DUMMY_DEPENDENCY: &'static str = include_str!("../../Cargo.toml");
+const _DUMMY_DEPENDENCY: &str = include_str!("../../Cargo.toml");
trait Command {
fn run(&self) -> failure::Fallible<()>;
diff --git a/src/cmd/sql.rs b/src/cmd/sql.rs
index 404c97e..bf4b768 100644
--- a/src/cmd/sql.rs
+++ b/src/cmd/sql.rs
@@ -78,7 +78,7 @@ fn format_value(v: &rusqlite::types::ValueRef) -> String {
rusqlite::types::ValueRef::Null => "null".to_string(),
rusqlite::types::ValueRef::Integer(i) => format!("{}", i),
rusqlite::types::ValueRef::Real(f) => format!("{}", f),
- rusqlite::types::ValueRef::Text(s) => format!("{}", s),
+ rusqlite::types::ValueRef::Text(s) => s.to_string(),
rusqlite::types::ValueRef::Blob(b) => format!("{:?}", b),
}
}
diff --git a/src/cmd/sync.rs b/src/cmd/sync.rs
index b6019c4..2d5b25b 100644
--- a/src/cmd/sync.rs
+++ b/src/cmd/sync.rs
@@ -35,8 +35,8 @@ impl super::Command for Command {
let to_fetch = lastfm.track_count(from)?;
if to_fetch > 0 {
- let bar = indicatif::ProgressBar::new(to_fetch);
- bar.set_style(
+ let pbar = indicatif::ProgressBar::new(to_fetch);
+ pbar.set_style(
indicatif::ProgressStyle::default_bar()
.progress_chars("=> ")
.template(
@@ -45,9 +45,9 @@ impl super::Command for Command {
),
);
- db.insert_tracks(bar.wrap_iter(lastfm.tracks(from)))?;
+ db.insert_tracks(pbar.wrap_iter(lastfm.tracks(from)))?;
- bar.finish_with_message("done");
+ pbar.finish_with_message("done");
}
Ok(())