Update faerie, remove usage of failure (#591)
This commit removes the usage of the `failure` crate and finishes up the final pieces of the migration to `std::error::Error` and `anyhow`. The `faerie` crate was updated to pull in its migration from `failure` to `anyhow` as well.
This commit is contained in:
committed by
Dan Gohman
parent
9182971697
commit
f2718a9573
@@ -4,9 +4,9 @@
|
||||
|
||||
use alloc::string::String;
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use cranelift_codegen::isa::TargetFrontendConfig;
|
||||
use faerie::{Artifact, Decl};
|
||||
use failure::Error;
|
||||
#[cfg(not(feature = "std"))]
|
||||
use hashbrown::{hash_map, HashMap, HashSet};
|
||||
use more_asserts::assert_gt;
|
||||
|
||||
@@ -5,7 +5,7 @@ use super::unit::PendingDieRef;
|
||||
use super::{DebugInputContext, Reader, TransformError};
|
||||
use crate::HashMap;
|
||||
use alloc::vec::Vec;
|
||||
use failure::Error;
|
||||
use anyhow::Error;
|
||||
use gimli::{
|
||||
write, AttributeValue, DebugLineOffset, DebugStr, DebuggingInformationEntry, UnitOffset,
|
||||
};
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
use super::address_transform::AddressTransform;
|
||||
use crate::{HashMap, HashSet};
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use cranelift_codegen::ir::{StackSlots, ValueLabel, ValueLoc};
|
||||
use cranelift_codegen::isa::RegUnit;
|
||||
use cranelift_codegen::ValueLabelsRanges;
|
||||
use cranelift_entity::EntityRef;
|
||||
use cranelift_wasm::{get_vmctx_value_label, DefinedFuncIndex};
|
||||
use failure::Error;
|
||||
use gimli::{self, write, Expression, Operation, Reader, ReaderOffset, Register, X86_64};
|
||||
use more_asserts::{assert_le, assert_lt};
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@ use super::attr::clone_attr_string;
|
||||
use super::{Reader, TransformError};
|
||||
use alloc::collections::BTreeMap;
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use core::iter::FromIterator;
|
||||
use cranelift_entity::EntityRef;
|
||||
use failure::Error;
|
||||
use gimli::{
|
||||
write, DebugLine, DebugLineOffset, DebugStr, DebuggingInformationEntry, LineEncoding, Unit,
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::gc::build_dependencies;
|
||||
use crate::{DebugInfoData, HashSet};
|
||||
use anyhow::Error;
|
||||
use cranelift_codegen::isa::TargetFrontendConfig;
|
||||
use failure::Error;
|
||||
use gimli::{
|
||||
write, DebugAddr, DebugAddrBase, DebugLine, DebugStr, LocationLists, RangeLists,
|
||||
UnitSectionOffset,
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
use super::address_transform::AddressTransform;
|
||||
use super::{DebugInputContext, Reader};
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use cranelift_entity::EntityRef;
|
||||
use cranelift_wasm::DefinedFuncIndex;
|
||||
use failure::Error;
|
||||
use gimli::{write, AttributeValue, DebuggingInformationEntry, RangeListsOffset};
|
||||
use more_asserts::assert_lt;
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@ use crate::read_debuginfo::WasmFileInfo;
|
||||
use crate::{HashMap, HashSet};
|
||||
use alloc::string::String;
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use cranelift_entity::EntityRef;
|
||||
use cranelift_wasm::get_vmctx_value_label;
|
||||
use failure::Error;
|
||||
use gimli::write;
|
||||
use gimli::{self, LineEncoding};
|
||||
use std::path::PathBuf;
|
||||
|
||||
@@ -7,8 +7,8 @@ use super::utils::{add_internal_types, append_vmctx_info, get_function_frame_inf
|
||||
use super::{DebugInputContext, Reader, TransformError};
|
||||
use crate::{HashMap, HashSet};
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use anyhow::Error;
|
||||
use cranelift_entity::EntityRef;
|
||||
use failure::Error;
|
||||
use gimli::write;
|
||||
use gimli::{AttributeValue, DebuggingInformationEntry, Unit, UnitOffset};
|
||||
use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use super::address_transform::AddressTransform;
|
||||
use super::expression::{CompiledExpression, FunctionFrameInfo};
|
||||
use alloc::vec::Vec;
|
||||
use anyhow::Error;
|
||||
use cranelift_wasm::DefinedFuncIndex;
|
||||
use failure::Error;
|
||||
use gimli::write;
|
||||
use wasmtime_environ::{ModuleVmctxInfo, ValueLabelsRanges};
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
use alloc::{string::String, vec::Vec};
|
||||
use core::result;
|
||||
use faerie::artifact::{Decl, SectionKind};
|
||||
use faerie::*;
|
||||
use gimli::write::{Address, Dwarf, EndianVec, Result, Sections, Writer};
|
||||
@@ -26,19 +25,19 @@ pub fn emit_dwarf(
|
||||
artifact: &mut Artifact,
|
||||
mut dwarf: Dwarf,
|
||||
symbol_resolver: &dyn SymbolResolver,
|
||||
) -> result::Result<(), failure::Error> {
|
||||
) -> anyhow::Result<()> {
|
||||
let endian = RunTimeEndian::Little;
|
||||
|
||||
let mut sections = Sections::new(WriterRelocate::new(endian, symbol_resolver));
|
||||
dwarf.write(&mut sections)?;
|
||||
sections.for_each_mut(|id, s| -> result::Result<(), failure::Error> {
|
||||
sections.for_each_mut(|id, s| -> anyhow::Result<()> {
|
||||
artifact.declare_with(
|
||||
id.name(),
|
||||
Decl::section(SectionKind::Debug),
|
||||
s.writer.take(),
|
||||
)
|
||||
})?;
|
||||
sections.for_each_mut(|id, s| -> result::Result<(), failure::Error> {
|
||||
sections.for_each_mut(|id, s| -> anyhow::Result<()> {
|
||||
for reloc in &s.relocs {
|
||||
artifact.link_with(
|
||||
faerie::Link {
|
||||
|
||||
Reference in New Issue
Block a user