Update immediate and transitive dependencies

I don't think this has happened in awhile but I've run a `cargo update`
as well as trimming some of the duplicate/older dependencies in
`Cargo.lock` by updating some of our immediate dependencies as well.

Cargo.toml

@@ -32,7 +32,7 @@ wasmtime-wast = { path = "crates/wast", version = "0.21.0" }
 wasmtime-wasi = { path = "crates/wasi", version = "0.21.0" }
 wasi-common = { path = "crates/wasi-common", version = "0.21.0" }
 structopt = { version = "0.3.5", features = ["color", "suggestions"] }
-object = { version = "0.21.1", default-features = false, features = ["write"] }
+object = { version = "0.22.0", default-features = false, features = ["write"] }
 anyhow = "1.0.19"
 target-lexicon = { version = "0.11.0", default-features = false }
 pretty_env_logger = "0.4.0"
@@ -41,11 +41,11 @@ wat = "1.0.27"
 libc = "0.2.60"
 log = "0.4.8"
 rayon = "1.2.1"
-humantime = "1.3.0"
+humantime = "2.0.0"
 wasmparser = "0.65"
 
 [dev-dependencies]
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 filecheck = "0.5.0"
 more-asserts = "0.2.1"
 tempfile = "3.1.0"

cranelift/codegen/Cargo.toml

@@ -21,7 +21,7 @@ target-lexicon = "0.11"
 log = { version = "0.4.6", default-features = false }
 serde = { version = "1.0.94", features = ["derive"], optional = true }
 bincode = { version = "1.2.1", optional = true }
-gimli = { version = "0.22.0", default-features = false, features = ["write"], optional = true }
+gimli = { version = "0.23.0", default-features = false, features = ["write"], optional = true }
 smallvec = { version = "1.0.0" }
 thiserror = "1.0.4"
 byteorder = { version = "1.3.2", default-features = false }

cranelift/filetests/Cargo.toml

@@ -19,7 +19,7 @@ cranelift-preopt = { path = "../preopt", version = "0.68.0" }
 byteorder = { version = "1.3.2", default-features = false }
 file-per-thread-logger = "0.1.2"
 filecheck = "0.5.0"
-gimli = { version = "0.22.0", default-features = false, features = ["read"] }
+gimli = { version = "0.23.0", default-features = false, features = ["read"] }
 log = "0.4.6"
 memmap = "0.7.0"
 num_cpus = "1.8.0"

cranelift/native/Cargo.toml

@@ -15,7 +15,7 @@ cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features
 target-lexicon = "0.11"
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
-raw-cpuid = "7.0.3"
+raw-cpuid = "8.1.2"
 
 [features]
 default = ["std"]

cranelift/object/Cargo.toml

@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 cranelift-module = { path = "../module", version = "0.68.0" }
 cranelift-codegen = { path = "../codegen", version = "0.68.0", default-features = false, features = ["std"] }
-object = { version = "0.21.1", default-features = false, features = ["write"] }
+object = { version = "0.22.0", default-features = false, features = ["write"] }
 target-lexicon = "0.11"
 anyhow = "1.0"
 log = { version = "0.4.6", default-features = false }

cranelift/peepmatic/crates/fuzzing/Cargo.toml

@@ -10,7 +10,7 @@ publish = false
 [dependencies]
 arbitrary = { version = "0.4.1", features = ["derive"] }
 bincode = "1.2.1"
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 fst = "0.4.1"
 log = "0.4.8"
 peepmatic = { path = "../.." }

cranelift/peepmatic/crates/test/Cargo.toml

@@ -8,7 +8,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 log = "0.4.8"
 peepmatic = { path = "../.." }
 peepmatic-runtime = { path = "../runtime" }

crates/c-api/Cargo.toml

@@ -17,7 +17,7 @@ test = false
 doctest = false
 
 [dependencies]
-env_logger = "0.7"
+env_logger = "0.8"
 anyhow = "1.0"
 once_cell = "1.3"
 wasmtime = { path = "../wasmtime", default-features = false }

crates/cache/Cargo.toml

@@ -10,13 +10,13 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0"
-base64 = "0.12.0"
+base64 = "0.13.0"
 bincode = "1.1.4"
-directories-next = "1.0"
+directories-next = "2.0"
 file-per-thread-logger = "0.1.1"
 log = { version = "0.4.8", default-features = false }
 serde = { version = "1.0.94", features = ["derive"] }
-sha2 = "0.8.0"
+sha2 = "0.9.0"
 toml = "0.5.5"
 zstd = "0.5"
 

crates/cache/src/lib.rs

@@ -50,7 +50,7 @@ impl<'config> ModuleCacheEntry<'config> {
     {
         let mut hasher = Sha256Hasher(Sha256::new());
         state.hash(&mut hasher);
-        let hash: [u8; 32] = hasher.0.result().into();
+        let hash: [u8; 32] = hasher.0.finalize().into();
         // standard encoding uses '/' which can't be used for filename
         let hash = base64::encode_config(&hash, base64::URL_SAFE_NO_PAD);
 
@@ -181,7 +181,7 @@ impl Hasher for Sha256Hasher {
     }
 
     fn write(&mut self, bytes: &[u8]) {
-        self.0.input(bytes);
+        self.0.update(bytes);
     }
 }
 

crates/debug/Cargo.toml

@@ -12,9 +12,9 @@ readme = "README.md"
 edition = "2018"
 
 [dependencies]
-gimli = "0.22.0"
+gimli = "0.23.0"
 wasmparser = "0.65.0"
-object = { version = "0.21.1", default-features = false, features = ["read", "write"] }
+object = { version = "0.22.0", default-features = false, features = ["read", "write"] }
 wasmtime-environ = { path = "../environ", version = "0.21.0" }
 target-lexicon = { version = "0.11.0", default-features = false }
 anyhow = "1.0"

crates/debug/src/gc.rs

@@ -78,7 +78,7 @@ pub fn build_dependencies<R: Reader<Offset = usize>>(
 }
 
 fn build_unit_dependencies<R: Reader<Offset = usize>>(
-    header: read::CompilationUnitHeader<R>,
+    header: read::UnitHeader<R>,
     dwarf: &read::Dwarf<R>,
     at: &AddressTransform,
     deps: &mut Dependencies,

crates/debug/src/lib.rs

@@ -37,16 +37,16 @@ fn relocate_dwarf_sections(
     defined_funcs_offset: usize,
     funcs: &[*const u8],
 ) -> Result<(), Error> {
-    use object::read::{File, Object, ObjectSection, RelocationTarget};
+    use object::read::{File, Object, ObjectSection, ObjectSymbol, RelocationTarget};
 
     let obj = File::parse(bytes)?;
     let mut func_symbols = HashMap::new();
-    for (id, sym) in obj.symbols() {
+    for sym in obj.symbols() {
         match (sym.name(), sym.section_index()) {
-            (Some(name), Some(_section_index)) if name.starts_with("_wasm_function_") => {
+            (Ok(name), Some(_section_index)) if name.starts_with("_wasm_function_") => {
                 let index = name["_wasm_function_".len()..].parse::<usize>()?;
                 let data = funcs[index - defined_funcs_offset];
-                func_symbols.insert(id, data);
+                func_symbols.insert(sym.index(), data);
             }
             _ => (),
         }

crates/debug/src/transform/refs.rs

@@ -1,7 +1,7 @@
 //! Helper utils for tracking and patching intra unit or section references.
 
 use gimli::write;
-use gimli::{CompilationUnitHeader, DebugInfoOffset, Reader, UnitOffset};
+use gimli::{DebugInfoOffset, Reader, UnitHeader, UnitOffset};
 use std::collections::HashMap;
 
 /// Stores compiled unit references: UnitEntryId+DwAt denotes a patch location
@@ -76,17 +76,15 @@ impl DebugInfoRefsMap {
             map: HashMap::new(),
         }
     }
-    pub fn insert<R>(
+    pub fn insert<R>(&mut self, unit: &UnitHeader<R>, unit_id: write::UnitId, unit_map: UnitRefsMap)
-        &mut self,
+    where
-        unit: &CompilationUnitHeader<R>,
-        unit_id: write::UnitId,
-        unit_map: UnitRefsMap,
-    ) where
         R: Reader<Offset = usize>,
     {
         self.map
             .extend(unit_map.map.into_iter().map(|(off, entry_id)| {
-                let off = off.to_debug_info_offset(unit);
+                let off = off
+                    .to_debug_info_offset(unit)
+                    .expect("should be in debug_info section");
                 (off, (unit_id, entry_id))
             }));
     }

crates/environ/Cargo.toml

@@ -23,7 +23,7 @@ serde = { version = "1.0.94", features = ["derive"] }
 log = { version = "0.4.8", default-features = false }
 more-asserts = "0.2.1"
 cfg-if = "1.0"
-gimli = "0.22"
+gimli = "0.23"
 
 [badges]
 maintenance = { status = "actively-developed" }

crates/fuzzing/Cargo.toml

@@ -9,7 +9,7 @@ version = "0.19.0"
 [dependencies]
 anyhow = "1.0.22"
 arbitrary = { version = "0.4.1", features = ["derive"] }
-env_logger = "0.7.1"
+env_logger = "0.8.1"
 log = "0.4.8"
 rayon = "1.2.1"
 wasmparser = "0.65.0"

crates/jit/Cargo.toml

@@ -33,8 +33,8 @@ more-asserts = "0.2.1"
 anyhow = "1.0"
 cfg-if = "1.0"
 log = "0.4"
-gimli = { version = "0.22.0", default-features = false, features = ["write"] }
+gimli = { version = "0.23.0", default-features = false, features = ["write"] }
-object = { version = "0.21.1", default-features = false, features = ["write"] }
+object = { version = "0.22.0", default-features = false, features = ["write"] }
 serde = { version = "1.0.94", features = ["derive"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]

crates/jit/src/code_memory.rs

@@ -5,7 +5,7 @@ use crate::object::{
     ObjectUnwindInfo,
 };
 use crate::unwind::UnwindRegistry;
-use object::read::{File as ObjectFile, Object, ObjectSection};
+use object::read::{File as ObjectFile, Object, ObjectSection, ObjectSymbol};
 use region;
 use std::collections::BTreeMap;
 use std::mem::ManuallyDrop;
@@ -292,9 +292,9 @@ impl CodeMemory {
         // Track locations of all defined functions and trampolines.
         let mut funcs = BTreeMap::new();
         let mut trampolines = BTreeMap::new();
-        for (_id, sym) in obj.symbols() {
+        for sym in obj.symbols() {
             match sym.name() {
-                Some(name) => {
+                Ok(name) => {
                     if let Some(index) = try_parse_func_name(name) {
                         let is_import = sym.section_index().is_none();
                         if !is_import {
@@ -308,7 +308,7 @@ impl CodeMemory {
                             .insert(index, (start + sym.address() as usize, sym.size() as usize));
                     }
                 }
-                None => (),
+                Err(_) => (),
             }
         }
 

crates/jit/src/link.rs

@@ -2,7 +2,7 @@
 
 use crate::object::utils::try_parse_func_name;
 use object::read::{Object, ObjectSection, Relocation, RelocationTarget};
-use object::{elf, File, RelocationEncoding, RelocationKind};
+use object::{elf, File, ObjectSymbol, RelocationEncoding, RelocationKind};
 use std::ptr::{read_unaligned, write_unaligned};
 use wasmtime_environ::entity::PrimaryMap;
 use wasmtime_environ::wasm::DefinedFuncIndex;
@@ -47,7 +47,7 @@ fn apply_reloc(
             // wasm function or runtime libcall.
             let sym = obj.symbol_by_index(i).unwrap();
             match sym.name() {
-                Some(name) => {
+                Ok(name) => {
                     if let Some(index) = try_parse_func_name(name) {
                         match module.defined_func_index(index) {
                             Some(f) => {
@@ -62,7 +62,7 @@ fn apply_reloc(
                         panic!("unknown function to link: {}", name);
                     }
                 }
-                None => panic!("unexpected relocation target: not a symbol"),
+                Err(_) => panic!("unexpected relocation target: not a symbol"),
             }
         }
         _ => panic!("unexpected relocation target"),

crates/lightbeam/Cargo.toml

@@ -17,8 +17,8 @@ derive_more = "0.99"
 dynasm = "0.5.2"
 dynasmrt = "0.5.2"
 iter-enum = "0.2"
-itertools = "0.8.2"
+itertools = "0.9.0"
-memoffset = "0.5.3"
+memoffset = "0.6.0"
 more-asserts = "0.2.1"
 smallvec = "1.0.0"
 staticvec = "0.10"

crates/obj/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 wasmtime-environ = { path = "../environ", version = "0.21.0" }
-object = { version = "0.21.1", default-features = false, features = ["write"] }
+object = { version = "0.22.0", default-features = false, features = ["write"] }
 more-asserts = "0.2.1"
 target-lexicon = { version = "0.11.0", default-features = false }
 wasmtime-debug = { path = "../debug", version = "0.21.0" }

crates/profiling/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0"
 cfg-if = "1.0"
-gimli = { version = "0.22.0", optional = true }
+gimli = { version = "0.23.0", optional = true }
 lazy_static = "1.4"
 libc = { version = "0.2.60", default-features = false }
 scroll = { version = "0.10.1", features = ["derive"], optional = true }
@@ -24,7 +24,7 @@ wasmtime-runtime = { path = "../runtime", version = "0.21.0" }
 ittapi-rs = { version = "0.1.5", optional = true }
 
 [dependencies.object]
-version = "0.21.1"
+version = "0.22.0"
 optional = true
 default-features = false
 features = ['read_core', 'elf', 'std']

crates/runtime/Cargo.toml

@@ -16,7 +16,7 @@ wasmtime-environ = { path = "../environ", version = "0.21.0" }
 region = "2.1.0"
 libc = { version = "0.2.70", default-features = false }
 log = "0.4.8"
-memoffset = "0.5.3"
+memoffset = "0.6.0"
 indexmap = "1.0.2"
 thiserror = "1.0.4"
 more-asserts = "0.2.1"

crates/wasi-common/Cargo.toml

@@ -20,7 +20,7 @@ links = "wasi-common-19"
 anyhow = "1.0"
 thiserror = "1.0"
 libc = "0.2"
-getrandom = { version = "0.1.14", features = ["std"] }
+getrandom = { version = "0.2.0", features = ["std"] }
 cfg-if = "1.0"
 filetime = "0.2.7"
 lazy_static = "1.4.0"

crates/wiggle/Cargo.toml

@@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" }
 
 [dev-dependencies]
 wiggle-test = { path = "test-helpers" }
-proptest = "0.9"
+proptest = "0.10"
 
 [features]
 # The wiggle proc-macro emits some code (inside `pub mod metadata`) guarded

crates/wiggle/test-helpers/Cargo.toml

@@ -12,15 +12,14 @@ include = ["src/**/*", "LICENSE"]
 publish = false
 
 [dependencies]
-proptest = "0.9"
+proptest = "0.10"
 wiggle = { path = "..", features = ["tracing_log"] }
 
 [dev-dependencies]
 thiserror = "1.0"
 tracing = "0.1.14"
 tracing-subscriber = "0.2.4"
-env_logger = "0.7"
+env_logger = "0.8"
-
 
 [badges]
 maintenance = { status = "actively-developed" }