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.

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"] }
-object = { version = "0.21.1", default-features = false, features = ["write"] }
+gimli = { version = "0.23.0", 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"),