summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-04-21 15:59:14 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-04-23 15:18:14 -0700
commitfc74ba2bb0f99c43ae5aee115602dff25fc2494d (patch)
treed828898202bd3f886ebfe9dcb048dd3db02c7a9a /src/libstd/sys
parent95d02a226de8c1525e6c9666412e3f08fac9714d (diff)
downloadrust-fc74ba2bb0f99c43ae5aee115602dff25fc2494d.tar.gz
rust-fc74ba2bb0f99c43ae5aee115602dff25fc2494d.zip
Test fixes and rebase conflicts, round 1
Conflicts:
	src/test/run-pass/task-stderr.rs
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/fs2.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/fs2.rs b/src/libstd/sys/windows/fs2.rs
index 7a41f02d270..4be93746049 100644
--- a/src/libstd/sys/windows/fs2.rs
+++ b/src/libstd/sys/windows/fs2.rs
@@ -12,7 +12,6 @@ use core::prelude::*;
 use io::prelude::*;
 use os::windows::prelude::*;
 
-use default::Default;
 use ffi::OsString;
 use fmt;
 use io::{self, Error, SeekFrom};