Merge branch 'update-deps' into 'master'

Update deps

See merge request redox-os/redox!2390

Cargo.toml

@@ -48,7 +48,7 @@ redoxer = { git = "https://gitlab.redox-os.org/redox-os/redoxer.git", default-fe
 regex = "1.11"
 serde = { version = "1", features = ["derive"] }
 termion = "4"
-toml = "0.8"
+toml = "1"
 walkdir = "2.3.1"
 ansi-to-tui = { version = "8", optional = true }
 strip-ansi-escapes = { version = "0.2.1", optional = true }

src/cook/cook_build.rs

@@ -9,7 +9,6 @@ use crate::cook::package::{package_source_paths, package_target};
 use crate::cook::{fetch, fs, pty::PtyOut, script::*};
 use crate::recipe::BuildCompiler;
 use crate::recipe::{AutoDeps, BuildKind, CookRecipe, OptionalPackageRecipe, Recipe};
-use std::io::Read;
 use std::{
     collections::{BTreeSet, VecDeque},
     path::{Path, PathBuf},
@@ -822,16 +821,14 @@ pub fn build_remote(
 }
 
 fn hint_incorrect_pkey(logger: &PtyOut, source_pubkey: &Path, source_pkgar: &Path) -> Option<()> {
-    // TODO: Move to pkgar
-    let mut file = std::fs::File::open(source_pkgar).ok()?;
-    let mut buffer = vec![0u8; pkgar_core::HEADER_SIZE];
-    file.read_exact(&mut buffer).ok()?;
     log_to_pty!(
         logger,
         "DEBUG: Pkgar key mismatch, hint:\n - expected: {:?}\n - current:  {:?}",
-        blake3::Hash::from_bytes(unsafe {
-            pkgar_core::Header::new_unchecked(&buffer).ok()?.public_key
-        })
+        blake3::Hash::from_bytes(
+            pkgar_keys::PublicKeyFile::from_header_path(source_pkgar)
+                .ok()?
+                .pkey
+        )
         .to_hex()
         .to_string(),
         blake3::Hash::from_bytes(PublicKeyFile::open(source_pubkey).ok()?.pkey)