Merge branch 'master' into ffi

Cargo.lock

@@ -367,6 +367,17 @@ dependencies = [
  "syn 1.0.103",
 ]
 
+[[package]]
+name = "derive_deref"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
+dependencies = [
+ "proc-macro2 1.0.47",
+ "quote 1.0.21",
+ "syn 1.0.103",
+]
+
 [[package]]
 name = "difflib"
 version = "0.4.0"
@@ -1850,6 +1861,7 @@ dependencies = [
  "crossterm",
  "crrl",
  "ctrlc",
+ "derive_deref",
  "dirs-next",
  "divrem",
  "futures",