Skip to content

Commit aab09be

Browse files
authored
Auto merge of #3044 - jeandudey:unused-code, r=alexcrichton
Remove unused macro (configure_shell) Also i've removed some unused lints on sha256.rs
2 parents b7d5203 + 2141f13 commit aab09be

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

src/bin/cargo.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,6 @@ fn main() {
7171
execute_main_without_stdin(execute, true, USAGE)
7272
}
7373

74-
macro_rules! configure_shell {
75-
($config:expr, $options:expr) => (
76-
try!($config.configure($options.flag_verbose,
77-
$options.flag_quiet,
78-
&$options.flag_color,
79-
$options.flag_frozen,
80-
$options.flag_locked));
81-
)
82-
}
83-
8474
macro_rules! each_subcommand{
8575
($mac:ident) => {
8676
$mac!(bench);

src/cargo/util/sha256.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ pub use self::imp::Sha256;
33
// Someone upstream will link to OpenSSL, so we don't need to explicitly
44
// link to it ourselves. Hence we pick up Sha256 digests from OpenSSL
55
#[cfg(not(windows))]
6-
// allow improper ctypes because size_t falls under that in old compilers
7-
#[allow(bad_style, improper_ctypes)]
86
mod imp {
97
extern crate openssl;
108

0 commit comments

Comments
 (0)