aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@cardoe.com>2017-10-30 11:18:41 -0500
committerDoug Goldstein <cardoe@cardoe.com>2017-10-30 11:18:41 -0500
commit08ca3fefb5550c292b2f64517eed9ebf85175fe3 (patch)
treeada1bd4702be8d4e8b704d7129c527acb5bf0a77 /src
parentadd missing license notices (diff)
downloadcargo-ebuild-08ca3fefb5550c292b2f64517eed9ebf85175fe3.tar.gz
cargo-ebuild-08ca3fefb5550c292b2f64517eed9ebf85175fe3.tar.bz2
cargo-ebuild-08ca3fefb5550c292b2f64517eed9ebf85175fe3.zip
rustfmt with 0.8.6
Diffstat (limited to 'src')
-rw-r--r--src/main.rs60
1 files changed, 31 insertions, 29 deletions
diff --git a/src/main.rs b/src/main.rs
index 1540683..d2e4301 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,7 +33,8 @@ fn workspace(config: &Config, manifest_path: Option<String>) -> CargoResult<Work
/// Generates a package registry by using the Cargo.lock or creating one as necessary
fn registry<'a>(config: &'a Config, package: &Package) -> CargoResult<PackageRegistry<'a>> {
let mut registry = PackageRegistry::new(config)?;
- registry.add_sources(&[package.package_id().source_id().clone()])?;
+ registry
+ .add_sources(&[package.package_id().source_id().clone()])?;
Ok(registry)
}
@@ -87,14 +88,15 @@ fn main() {
}
fn real_main(options: Options, config: &Config) -> CliResult {
- config.configure(options.flag_verbose,
- options.flag_quiet,
- /* color */
- &None,
- /* frozen */
- false,
- /* locked */
- false)?;
+ config
+ .configure(options.flag_verbose,
+ options.flag_quiet,
+ /* color */
+ &None,
+ /* frozen */
+ false,
+ /* locked */
+ false)?;
// Load the workspace and current package
let workspace = workspace(config, None)?;
@@ -105,7 +107,8 @@ fn real_main(options: Options, config: &Config) -> CliResult {
let resolve = resolve(&mut registry, &workspace)?;
// build the crates the package needs
- let mut crates = resolve.1
+ let mut crates = resolve
+ .1
.iter()
.map(|pkg| format!("{}-{}\n", pkg.name(), pkg.version()))
.collect::<Vec<String>>();
@@ -117,21 +120,22 @@ fn real_main(options: Options, config: &Config) -> CliResult {
let metadata = package.manifest().metadata();
// package description
- let desc = metadata.description
+ let desc = metadata
+ .description
.as_ref()
.cloned()
.unwrap_or_else(|| String::from(package.name()));
// package homepage
- let homepage = metadata.homepage
- .as_ref()
- .cloned()
- .unwrap_or(metadata.repository
- .as_ref()
- .cloned()
- .unwrap_or_else(|| String::from("")));
-
- let license = metadata.license
+ let homepage =
+ metadata.homepage.as_ref().cloned().unwrap_or(metadata
+ .repository
+ .as_ref()
+ .cloned()
+ .unwrap_or_else(|| String::from("")));
+
+ let license = metadata
+ .license
.as_ref()
.cloned()
.unwrap_or_else(|| String::from("unknown license"));
@@ -140,15 +144,13 @@ fn real_main(options: Options, config: &Config) -> CliResult {
let ebuild_path = PathBuf::from(format!("{}-{}.ebuild", package.name(), package.version()));
// Open the file where we'll write the ebuild
- let mut file = try!(OpenOptions::new()
- .write(true)
- .create(true)
- .truncate(true)
- .open(&ebuild_path)
- .map_err(|err| {
- human(format!("failed to create ebuild: {}",
- err.description()))
- }));
+ let mut file =
+ try!(OpenOptions::new()
+ .write(true)
+ .create(true)
+ .truncate(true)
+ .open(&ebuild_path)
+ .map_err(|err| human(format!("failed to create ebuild: {}", err.description()))));
// write the contents out
try!(write!(file,