From f7d86b2f4ace416a65e84603082c756b8b5dc43e Mon Sep 17 00:00:00 2001 From: Jakub Wieczorek Date: Fri, 6 Jun 2014 15:51:42 +0200 Subject: Remove the dead code identified by the new lint --- src/libstd/collections/hashmap.rs | 5 ++--- src/libstd/rt/backtrace.rs | 1 + src/libstd/task.rs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/collections/hashmap.rs b/src/libstd/collections/hashmap.rs index 571c5794704..99544f2ff3b 100644 --- a/src/libstd/collections/hashmap.rs +++ b/src/libstd/collections/hashmap.rs @@ -393,7 +393,7 @@ mod table { } pub fn move_iter(self) -> MoveEntries { - MoveEntries { table: self, idx: 0, elems_seen: 0 } + MoveEntries { table: self, idx: 0 } } } @@ -428,8 +428,7 @@ mod table { /// Iterator over the entries in a table, consuming the table. pub struct MoveEntries { table: RawTable, - idx: uint, - elems_seen: uint, + idx: uint } impl<'a, K, V> Iterator<(&'a K, &'a V)> for Entries<'a, K, V> { diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 766901fa04f..f1717c3a2ba 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -325,6 +325,7 @@ mod imp { #[cfg(target_os = "macos")] fn print(w: &mut Writer, idx: int, addr: *libc::c_void) -> IoResult<()> { use intrinsics; + #[repr(C)] struct Dl_info { dli_fname: *libc::c_char, dli_fbase: *libc::c_void, diff --git a/src/libstd/task.rs b/src/libstd/task.rs index 9ee62ee3d81..a4e1ad84252 100644 --- a/src/libstd/task.rs +++ b/src/libstd/task.rs @@ -84,7 +84,7 @@ pub struct TaskBuilder { /// Options to spawn the new task with pub opts: TaskOpts, gen_body: Option proc():Send>, - nocopy: Option, + nocopy: marker::NoCopy, } impl TaskBuilder { @@ -94,7 +94,7 @@ impl TaskBuilder { TaskBuilder { opts: TaskOpts::new(), gen_body: None, - nocopy: None, + nocopy: marker::NoCopy, } } -- cgit 1.4.1-3-g733a5