Skip to content
This repository has been archived by the owner on Jan 14, 2023. It is now read-only.

Commit

Permalink
applied cargo fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
ryankurte authored and Yatekii committed May 17, 2020
1 parent fd6aed6 commit ee858ce
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ mod logging;

use structopt;

use cargo_toml::Manifest;
use colored::*;
use failure::format_err;
use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
Expand All @@ -16,7 +17,6 @@ use std::{
time::Instant,
};
use structopt::StructOpt;
use cargo_toml::Manifest;

use serde::Deserialize;

Expand Down Expand Up @@ -185,7 +185,7 @@ fn main_try() -> Result<(), failure::Error> {
// Load cargo manifest if available and parse out meta object
// TODO: should we pull out a relative path here?
let meta = match Manifest::<Meta>::from_path_with_metadata("Cargo.toml") {
Ok(m) => m.package.map(|p| p.metadata ).flatten(),
Ok(m) => m.package.map(|p| p.metadata).flatten(),
Err(_e) => None,
};

Expand All @@ -199,10 +199,10 @@ fn main_try() -> Result<(), failure::Error> {
std::process::exit(0);
} else {
// First use command line, then manifest, then default to auto
match (opt.chip, meta.map(|m| m.chip ).flatten()) {
match (opt.chip, meta.map(|m| m.chip).flatten()) {
(Some(c), _) => c.into(),
(_, Some(c)) => c.into(),
_ => TargetSelector::Auto
_ => TargetSelector::Auto,
}
};

Expand Down

0 comments on commit ee858ce

Please sign in to comment.