Update to rust master

3 files changed, 5 insertions, 3 deletions

diff --git a/src/agent.rs b/src/agent.rs
index 3303b1a..446c5ba 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -86,7 +86,8 @@ impl<'a> Drop for Agent<'a> {
     }
 }
 
-impl<'agent> Iterator<Result<PublicKey<'agent>, Error>> for Identities<'agent> {
+impl<'agent> Iterator for Identities<'agent> {
+    type Item = Result<PublicKey<'agent>, Error>;
     fn next(&mut self) -> Option<Result<PublicKey<'agent>, Error>> {
         unsafe {
             let mut next = 0 as *mut _;
diff --git a/src/knownhosts.rs b/src/knownhosts.rs
index 3a0635f..a409af9 100644
--- a/src/knownhosts.rs
+++ b/src/knownhosts.rs
@@ -227,7 +227,8 @@ impl<'a> Drop for KnownHosts<'a> {
     }
 }
 
-impl<'kh> Iterator<Result<Host<'kh>, Error>> for Hosts<'kh> {
+impl<'kh> Iterator for Hosts<'kh> {
+    type Item = Result<Host<'kh>, Error>;
     fn next(&mut self) -> Option<Result<Host<'kh>, Error>> {
         unsafe {
             let mut next = 0 as *mut _;
diff --git a/src/lib.rs b/src/lib.rs
index 9bcef9e..d4ce3fc 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -88,7 +88,7 @@
 //! let contents = remote_file.read_to_end();
 //! ```
 
-#![feature(phase, unsafe_destructor)]
+#![feature(phase, unsafe_destructor, associated_types)]
 #![deny(warnings, missing_docs)]
 
 extern crate "libssh2-sys" as raw;