Merge branch 'master' into plugins

2020-06-11 22:45:20 +08:00
parent d4ebb3c96d e4cca7620f
commit d03f6ed983
14 changed files with 467 additions and 492 deletions
--- a/src/fn_native.rs
+++ b/src/fn_native.rs
@@ -89,9 +89,9 @@ impl fmt::Debug for CallableFunction {
        match self {
            Self::Pure(_) => write!(f, "NativePureFunction"),
            Self::Method(_) => write!(f, "NativeMethod"),
-            Self::Iterator(_) => write!(f, "IteratorFunction"),
+            Self::Iterator(_) => write!(f, "NativeIterator"),
            Self::Plugin(_) => write!(f, "PluginFunction"),
-            Self::Script(fn_def) => write!(f, "{:?}", fn_def),
+            Self::Script(fn_def) => fmt::Debug::fmt(fn_def, f),
        }
    }
 }