Use 'dyn' keyword with trait objects

Author: seanmonstar

.travis.yml

@@ -14,7 +14,7 @@ matrix:
         - rustup target add wasm32-unknown-unknown
         - cargo build --target=wasm32-unknown-unknown
     # minimum rustc version
-    - rust: 1.26.0
+    - rust: 1.30.0
       script: cargo build
 
 script:

src/error.rs

@@ -47,7 +47,7 @@ impl Error {
     }
 
     /// Return a reference to the lower level, inner error.
-    pub fn get_ref(&self) -> &(error::Error + 'static) {
+    pub fn get_ref(&self) -> &(dyn error::Error + 'static) {
         use self::ErrorKind::*;
 
         match self.inner {
@@ -83,9 +83,8 @@ impl error::Error for Error {
 
     // Return any available cause from the inner error. Note the inner error is
     // not itself the cause.
-    #[allow(deprecated)]
-    fn cause(&self) -> Option<&error::Error> {
-        self.get_ref().cause()
+    fn source(&self) -> Option<&(dyn error::Error + 'static)> {
+        self.get_ref().source()
     }
 }
 

src/extensions.rs

@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::hash::{BuildHasherDefault, Hasher};
 use std::fmt;
 
-type AnyMap = HashMap<TypeId, Box<Any + Send + Sync>, BuildHasherDefault<IdHasher>>;
+type AnyMap = HashMap<TypeId, Box<dyn Any + Send + Sync>, BuildHasherDefault<IdHasher>>;
 
 // With TypeIds as keys, there's no need to hash them. They are already hashes
 // themselves, coming from the compiler. The IdHasher just holds the u64 of
@@ -70,7 +70,7 @@ impl Extensions {
             .insert(TypeId::of::<T>(), Box::new(val))
             .and_then(|boxed| {
                 //TODO: we can use unsafe and remove double checking the type id
-                (boxed as Box<Any + 'static>)
+                (boxed as Box<dyn Any + 'static>)
                     .downcast()
                     .ok()
                     .map(|boxed| *boxed)
@@ -95,7 +95,7 @@ impl Extensions {
             .as_ref()
             .and_then(|map| map.get(&TypeId::of::<T>()))
             //TODO: we can use unsafe and remove double checking the type id
-            .and_then(|boxed| (&**boxed as &(Any + 'static)).downcast_ref())
+            .and_then(|boxed| (&**boxed as &(dyn Any + 'static)).downcast_ref())
     }
 
     /// Get a mutable reference to a type previously inserted on this `Extensions`.
@@ -116,7 +116,7 @@ impl Extensions {
             .as_mut()
             .and_then(|map| map.get_mut(&TypeId::of::<T>()))
             //TODO: we can use unsafe and remove double checking the type id
-            .and_then(|boxed| (&mut **boxed as &mut (Any + 'static)).downcast_mut())
+            .and_then(|boxed| (&mut **boxed as &mut (dyn Any + 'static)).downcast_mut())
     }
 
 
@@ -140,7 +140,7 @@ impl Extensions {
             .and_then(|map| map.remove(&TypeId::of::<T>()))
             .and_then(|boxed| {
                 //TODO: we can use unsafe and remove double checking the type id
-                (boxed as Box<Any + 'static>)
+                (boxed as Box<dyn Any + 'static>)
                     .downcast()
                     .ok()
                     .map(|boxed| *boxed)