summaryrefslogtreecommitdiffstats
path: root/src/commands/db.rs
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@atos.net>2021-05-10 14:43:45 +0200
committerMatthias Beyer <mail@beyermatthias.de>2021-05-11 10:47:59 +0200
commit79fa2aebeb9c5daafd72e061466de97c4fcacc36 (patch)
tree6595c708b5c4765a791d3e1bf88009c0072ff18d /src/commands/db.rs
parentca55fb3a9cb77b2ed22335adfe9f7bc986c37aaa (diff)
Refactor: Implement FromStr
Instead of having a function `&str -> Result<Self>` on the type, implement the `std::str::FromStr` trait to be more rusty here. Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
Diffstat (limited to 'src/commands/db.rs')
-rw-r--r--src/commands/db.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/commands/db.rs b/src/commands/db.rs
index 9fc1e77..062858b 100644
--- a/src/commands/db.rs
+++ b/src/commands/db.rs
@@ -485,7 +485,7 @@ fn job(conn_cfg: DbConnectionConfig, config: &Configuration, matches: &ArgMatche
models::Image,
)>(&conn)?;
- let parsed_log = crate::log::ParsedLog::build_from(&data.0.log_text)?;
+ let parsed_log = crate::log::ParsedLog::from_str(&data.0.log_text)?;
let success = parsed_log.is_successfull();
if csv {
@@ -643,7 +643,7 @@ fn log_of(conn_cfg: DbConnectionConfig, matches: &ArgMatches) -> Result<()> {
.select(schema::jobs::dsl::log_text)
.first::<String>(&conn)
.map_err(Error::from)
- .and_then(crate::log::ParsedLog::build_from)?
+ .and_then(|s| crate::log::ParsedLog::from_str(&s))?
.iter()
.map(|line| line.display().and_then(|d| writeln!(lock, "{}", d).map_err(Error::from)))
.collect::<Result<Vec<()>>>()
@@ -697,6 +697,6 @@ fn releases(conn_cfg: DbConnectionConfig, config: &Configuration, matches: &ArgM
///
/// Returns Ok(None) if cannot be decided
fn is_job_successful(job: &models::Job) -> Result<Option<bool>> {
- crate::log::ParsedLog::build_from(&job.log_text).map(|pl| pl.is_successfull())
+ crate::log::ParsedLog::from_str(&job.log_text).map(|pl| pl.is_successfull())
}