Add dyn to be rust nightly compatible (#2538)

denoland · Jun 18, 2019 · ed390a5 · ed390a5
1 parent d5e80ad
commit ed390a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cli/repl.rs b/cli/repl.rs
@@ -94,7 +94,7 @@ impl Repl {
       .editor
       .readline(&prompt)
       .map(|line| {
-        self.editor.add_history_entry(line.as_ref());
+        self.editor.add_history_entry(line.clone());
         line
       }).map_err(|e| deno_error(ErrorKind::Other, e.description().to_string()))
     // Forward error to TS side for processing

diff --git a/core/isolate.rs b/core/isolate.rs
@@ -76,10 +76,10 @@ pub enum StartupData<'a> {
 
 pub type OpResult<E> = Result<Op<E>, E>;
 
-type CoreDispatchFn = Fn(&[u8], Option<PinnedBuf>) -> CoreOp;
+type CoreDispatchFn = dyn Fn(&[u8], Option<PinnedBuf>) -> CoreOp;
 
 pub type DynImportFuture = Box<dyn Future<Item = deno_mod, Error = ()> + Send>;
-type DynImportFn = Fn(&str, &str) -> DynImportFuture;
+type DynImportFn = dyn Fn(&str, &str) -> DynImportFuture;
 
 /// Wraps DynImportFuture to include the deno_dyn_import_id, so that it doesn't
 /// need to be exposed.

diff --git a/core/modules.rs b/core/modules.rs
@@ -597,7 +597,7 @@ mod tests {
   }
 
   impl Error for MockError {
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<&dyn Error> {
       unimplemented!()
     }
   }