Skip to content

Commit 2cdeb07

Browse files
borsbors
committed
Auto merge of #2217 - alexcrichton:cleanup, r=alexcrichton
This From impl has been around for awhile.
2 parents 9780093 + ec42c79 commit 2cdeb07

18 files changed

+61
-94
lines changed

‎src/bin/bench.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
8989
},
9090
};
9191

92-
let err = try!(ops::run_benches(&root, &ops,
93-
&options.arg_args).map_err(|err| {
94-
CliError::from_boxed(err, 101)
95-
}));
92+
let err = try!(ops::run_benches(&root, &ops, &options.arg_args));
9693
match err {
9794
None => Ok(None),
9895
Some(err) => {

‎src/bin/build.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::env;
33
use cargo::ops::CompileOptions;
44
use cargo::ops;
55
use cargo::util::important_paths::{find_root_manifest_for_wd};
6-
use cargo::util::{CliResult, CliError, Config};
6+
use cargo::util::{CliResult, Config};
77

88
#[derive(RustcDecodable)]
99
struct Options {
@@ -85,7 +85,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
8585
target_rustc_args: None,
8686
};
8787

88-
ops::compile(&root, &opts).map(|_| None).map_err(|err| {
89-
CliError::from_boxed(err, 101)
90-
})
88+
try!(ops::compile(&root, &opts));
89+
Ok(None)
9190
}

‎src/bin/clean.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
use cargo::ops;
4-
use cargo::util::{CliResult, CliError, Config};
4+
use cargo::util::{CliResult, Config};
55
use cargo::util::important_paths::{find_root_manifest_for_wd};
66

77
#[derive(RustcDecodable)]
@@ -49,7 +49,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
4949
target: options.flag_target.as_ref().map(|s| &s[..]),
5050
release: options.flag_release,
5151
};
52-
ops::clean(&root, &opts).map(|_| None).map_err(|err| {
53-
CliError::from_boxed(err, 101)
54-
})
52+
try!(ops::clean(&root, &opts));
53+
Ok(None)
5554
}

‎src/bin/doc.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33
use cargo::util::important_paths::{find_root_manifest_for_wd};
44

55
#[derive(RustcDecodable)]
@@ -74,9 +74,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
7474
},
7575
};
7676

77-
try!(ops::doc(&root, &doc_opts).map_err(|err| {
78-
CliError::from_boxed(err, 101)
79-
}));
80-
77+
try!(ops::doc(&root, &doc_opts));
8178
Ok(None)
8279
}

‎src/bin/fetch.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33
use cargo::util::important_paths::find_root_manifest_for_wd;
44

55
#[derive(RustcDecodable)]
@@ -37,9 +37,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3737
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
3838
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
3939
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
40-
try!(ops::fetch(&root, config).map_err(|e| {
41-
CliError::from_boxed(e, 101)
42-
}));
40+
try!(ops::fetch(&root, config));
4341
Ok(None)
4442
}
4543

‎src/bin/generate_lockfile.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
use cargo::ops;
4-
use cargo::util::{CliResult, CliError, Config};
4+
use cargo::util::{CliResult, Config};
55
use cargo::util::important_paths::find_root_manifest_for_wd;
66

77
#[derive(RustcDecodable)]
@@ -32,6 +32,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3232
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
3333
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
3434

35-
ops::generate_lockfile(&root, config)
36-
.map(|_| None).map_err(|err| CliError::from_boxed(err, 101))
35+
try!(ops::generate_lockfile(&root, config));
36+
Ok(None)
3737
}

‎src/bin/login.rs

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::io;
44
use cargo::ops;
55
use cargo::core::{SourceId, Source};
66
use cargo::sources::RegistrySource;
7-
use cargo::util::{CliResult, CliError, Config};
7+
use cargo::util::{CliResult, Config, human, ChainError};
88

99
#[derive(RustcDecodable)]
1010
struct Options {
@@ -36,28 +36,23 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3636
let token = match options.arg_token.clone() {
3737
Some(token) => token,
3838
None => {
39-
let err = (|| {
40-
let src = try!(SourceId::for_central(config));
41-
let mut src = RegistrySource::new(&src, config);
42-
try!(src.update());
43-
let config = try!(src.config());
44-
let host = options.flag_host.clone().unwrap_or(config.api);
45-
println!("please visit {}me and paste the API Token below",
46-
host);
47-
let mut line = String::new();
48-
let input = io::stdin();
49-
try!(input.lock().read_line(&mut line));
50-
Ok(line)
51-
})();
52-
53-
try!(err.map_err(|e| CliError::from_boxed(e, 101)))
39+
let src = try!(SourceId::for_central(config));
40+
let mut src = RegistrySource::new(&src, config);
41+
try!(src.update());
42+
let config = try!(src.config());
43+
let host = options.flag_host.clone().unwrap_or(config.api);
44+
println!("please visit {}me and paste the API Token below", host);
45+
let mut line = String::new();
46+
let input = io::stdin();
47+
try!(input.lock().read_line(&mut line).chain_error(|| {
48+
human("failed to read stdin")
49+
}));
50+
line
5451
}
5552
};
5653

5754
let token = token.trim().to_string();
58-
try!(ops::registry_login(config, token).map_err(|e| {
59-
CliError::from_boxed(e, 101)
60-
}));
55+
try!(ops::registry_login(config, token));
6156
Ok(None)
6257
}
6358

‎src/bin/new.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
use cargo::ops;
4-
use cargo::util::{CliResult, CliError, Config};
4+
use cargo::util::{CliResult, Config};
55

66
#[derive(RustcDecodable)]
77
struct Options {
@@ -47,8 +47,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
4747
name: flag_name.as_ref().map(|s| s.as_ref()),
4848
};
4949

50-
ops::new(opts, config).map(|_| None).map_err(|err| {
51-
CliError::from_boxed(err, 101)
52-
})
50+
try!(ops::new(opts, config));
51+
Ok(None)
5352
}
5453

‎src/bin/owner.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33

44
#[derive(RustcDecodable)]
55
struct Options {
@@ -51,9 +51,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
5151
to_remove: options.flag_remove,
5252
list: options.flag_list,
5353
};
54-
try!(ops::modify_owners(config, &opts).map_err(|e| {
55-
CliError::from_boxed(e, 101)
56-
}));
54+
try!(ops::modify_owners(config, &opts));
5755
Ok(None)
5856
}
5957

‎src/bin/package.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33
use cargo::util::important_paths::find_root_manifest_for_wd;
44

55
#[derive(RustcDecodable)]
@@ -35,10 +35,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3535
try!(config.shell().set_verbosity(options.flag_verbose, options.flag_quiet));
3636
try!(config.shell().set_color_config(options.flag_color.as_ref().map(|s| &s[..])));
3737
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
38-
ops::package(&root, config,
39-
!options.flag_no_verify,
40-
options.flag_list,
41-
!options.flag_no_metadata).map(|_| None).map_err(|err| {
42-
CliError::from_boxed(err, 101)
43-
})
38+
try!(ops::package(&root, config,
39+
!options.flag_no_verify,
40+
options.flag_list,
41+
!options.flag_no_metadata));
42+
Ok(None)
4443
}

‎src/bin/pkgid.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33
use cargo::util::important_paths::{find_root_manifest_for_wd};
44

55
#[derive(RustcDecodable)]
@@ -52,9 +52,7 @@ pub fn execute(options: Options,
5252
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path.clone(), config.cwd()));
5353

5454
let spec = options.arg_spec.as_ref().map(|s| &s[..]);
55-
let spec = try!(ops::pkgid(&root, spec, config).map_err(|err| {
56-
CliError::from_boxed(err, 101)
57-
}));
55+
let spec = try!(ops::pkgid(&root, spec, config));
5856
println!("{}", spec);
5957
Ok(None)
6058
}

‎src/bin/publish.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33
use cargo::util::important_paths::find_root_manifest_for_wd;
44

55
#[derive(RustcDecodable)]
@@ -43,7 +43,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
4343
} = options;
4444

4545
let root = try!(find_root_manifest_for_wd(flag_manifest_path.clone(), config.cwd()));
46-
ops::publish(&root, config, token, host, !no_verify).map(|_| None).map_err(|err| {
47-
CliError::from_boxed(err, 101)
48-
})
46+
try!(ops::publish(&root, config, token, host, !no_verify));
47+
Ok(None)
4948
}

‎src/bin/read_manifest.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::env;
22
use std::error::Error;
33

44
use cargo::core::{Package, Source};
5-
use cargo::util::{CliResult, CliError, Config};
5+
use cargo::util::{CliResult, Config};
66
use cargo::util::important_paths::{find_root_manifest_for_wd};
77
use cargo::sources::{PathSource};
88

@@ -31,13 +31,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<Package>>
3131

3232
let root = try!(find_root_manifest_for_wd(options.flag_manifest_path, config.cwd()));
3333

34-
let mut source = try!(PathSource::for_path(root.parent().unwrap(), config).map_err(|e| {
35-
CliError::new(e.description(), 1)
36-
}));
34+
let mut source = try!(PathSource::for_path(root.parent().unwrap(), config));
35+
try!(source.update());
3736

38-
try!(source.update().map_err(|err| CliError::new(err.description(), 1)));
39-
40-
source.root_package()
41-
.map(Some)
42-
.map_err(|err| CliError::from_boxed(err, 1))
37+
let pkg = try!(source.root_package());
38+
Ok(Some(pkg))
4339
}

‎src/bin/rustc.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::env;
33
use cargo::ops::CompileOptions;
44
use cargo::ops;
55
use cargo::util::important_paths::{find_root_manifest_for_wd};
6-
use cargo::util::{CliResult, CliError, Config};
6+
use cargo::util::{CliResult, Config};
77

88
#[derive(RustcDecodable)]
99
struct Options {
@@ -89,8 +89,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
8989
target_rustc_args: options.arg_opts.as_ref().map(|a| &a[..]),
9090
};
9191

92-
ops::compile(&root, &opts).map(|_| None).map_err(|err| {
93-
CliError::from_boxed(err, 101)
94-
})
92+
try!(ops::compile(&root, &opts));
93+
Ok(None)
9594
}
9695

‎src/bin/search.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33

44
#[derive(RustcDecodable)]
55
struct Options {
@@ -34,7 +34,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
3434
..
3535
} = options;
3636

37-
ops::search(&query, config, host)
38-
.map(|_| None)
39-
.map_err(|err| CliError::from_boxed(err, 101))
37+
try!(ops::search(&query, config, host));
38+
Ok(None)
4039
}

‎src/bin/test.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
9595
},
9696
};
9797

98-
let err = try!(ops::run_tests(&root, &ops,
99-
&options.arg_args).map_err(|err| {
100-
CliError::from_boxed(err, 101)
101-
}));
98+
let err = try!(ops::run_tests(&root, &ops, &options.arg_args));
10299
match err {
103100
None => Ok(None),
104101
Some(err) => {

‎src/bin/update.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
use cargo::ops;
4-
use cargo::util::{CliResult, CliError, Config};
4+
use cargo::util::{CliResult, Config};
55
use cargo::util::important_paths::find_root_manifest_for_wd;
66

77
#[derive(RustcDecodable)]
@@ -65,7 +65,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
6565
config: config,
6666
};
6767

68-
ops::update_lockfile(&root, &update_opts)
69-
.map(|_| None).map_err(|err| CliError::from_boxed(err, 101))
68+
try!(ops::update_lockfile(&root, &update_opts));
69+
Ok(None)
7070
}
7171

‎src/bin/yank.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cargo::ops;
2-
use cargo::util::{CliResult, CliError, Config};
2+
use cargo::util::{CliResult, Config};
33

44
#[derive(RustcDecodable)]
55
struct Options {
@@ -46,9 +46,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
4646
options.flag_vers,
4747
options.flag_token,
4848
options.flag_index,
49-
options.flag_undo).map_err(|e| {
50-
CliError::from_boxed(e, 101)
51-
}));
49+
options.flag_undo));
5250
Ok(None)
5351
}
5452

0 commit comments

Comments
 (0)