summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortummychow <tummychow@users.noreply.github.com>2018-02-26 21:22:25 -0800
committertummychow <tummychow@users.noreply.github.com>2018-02-26 21:22:25 -0800
commit5438990e63a65d48a1b6c5da4ff75ee49474502e (patch)
treef1c91192b1be2caaf90b4a9b0c9f2bcc68334990
parent9843d7fbb3c8fb14099df599bbf2000e8db1d931 (diff)
remove some use statements
iter is redundant because of the prelude, process is unnecessary when i only use it once
-rw-r--r--src/commute.rs11
-rw-r--r--src/main.rs3
2 files changed, 6 insertions, 8 deletions
diff --git a/src/commute.rs b/src/commute.rs
index 87bb866..03dfefd 100644
--- a/src/commute.rs
+++ b/src/commute.rs
@@ -1,7 +1,6 @@
extern crate failure;
use owned;
-use std::iter;
/// Returns the unchanged lines around this hunk.
///
@@ -45,8 +44,8 @@ fn anchors(hunk: &owned::Hunk) -> (usize, usize, usize, usize) {
/// as it finds two pairwise inequal elements.
fn uniform<I, E>(iter: I) -> bool
where
- I: iter::IntoIterator<Item = E>,
- E: ::std::cmp::Eq,
+ I: IntoIterator<Item = E>,
+ E: Eq,
{
let mut iter = iter.into_iter();
match iter.next() {
@@ -106,8 +105,8 @@ pub fn commute(first: &owned::Hunk, second: &owned::Hunk) -> Option<(owned::Hunk
pub fn commute_diff_before<'a, I>(after: &owned::Hunk, before: I) -> Option<owned::Hunk>
where
- I: iter::IntoIterator<Item = &'a owned::Hunk>,
- <I as iter::IntoIterator>::IntoIter: iter::DoubleEndedIterator,
+ I: IntoIterator<Item = &'a owned::Hunk>,
+ <I as IntoIterator>::IntoIter: DoubleEndedIterator,
{
before
.into_iter()
@@ -174,7 +173,7 @@ mod tests {
#[test]
fn test_commute_interleave() {
- let mut line = iter::repeat(b"bar\n".to_vec());
+ let mut line = ::std::iter::repeat(b"bar\n".to_vec());
let hunk1 = owned::Hunk {
added: owned::Block {
start: 1,
diff --git a/src/main.rs b/src/main.rs
index ab42cd2..4d4e83d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,6 @@ extern crate slog;
extern crate slog_async;
extern crate slog_term;
-use std::process;
use slog::Drain;
fn main() {
@@ -70,6 +69,6 @@ fn main() {
crit!(logger, "absorb failed"; "err" => e.to_string());
// wait for async logger to finish writing messages
drop(logger);
- process::exit(1);
+ ::std::process::exit(1);
}
}