wasmtime-environ: use crate::error instead of anyhow (#12203)

* Temporarily re-export `anyhow` as `wasmtime_environ::error`

This is intended to ease the migration to the `wasmtime-internal-error`
crate. Follow up PRs will start moving crates in our workspace over to using
this re-export and not depending on `anyhow` directly themselves. Finally, we
will swap out this re-export for a re-export of the `wasmtime-internal-error`
crate.

* rename existing `error` module to `wasm_error`

* wasmtime-environ: use `crate::error` instead of `anyhow`

Part of migrating to the `wasmtime-internal-error` crate.

Depends on #12202

Author: fitzgen

crates/environ/examples/factc.rs

@@ -1,9 +1,12 @@
-use anyhow::{Context, Result, bail};
 use clap::Parser;
 use std::io::{IsTerminal, Write};
 use std::path::{Path, PathBuf};
 use wasmparser::{Validator, WasmFeatures};
-use wasmtime_environ::{ScopeVec, Tunables, component::*};
+use wasmtime_environ::{
+    ScopeVec, Tunables,
+    component::*,
+    error::{Context, Result, bail},
+};
 
 /// A small helper utility to explore generated adapter modules from Wasmtime's
 /// adapter fusion compiler.

crates/environ/src/compile/mod.rs

@@ -1,12 +1,12 @@
 //! A `Compilation` contains the compiled function bodies for a WebAssembly
 //! module.
 
+use crate::error::Result;
 use crate::prelude::*;
 use crate::{
     DefinedFuncIndex, FlagValue, FuncKey, FunctionLoc, ObjectKind, PrimaryMap, StaticModuleIndex,
     TripleExt, Tunables, WasmError, WasmFuncType, obj,
 };
-use anyhow::Result;
 use object::write::{Object, SymbolId};
 use object::{Architecture, BinaryFormat, FileFlags};
 use std::any::Any;

crates/environ/src/compile/module_artifacts.rs

@@ -1,12 +1,12 @@
 //! Definitions of runtime structures and metadata which are serialized into ELF
 //! with `postcard` as part of a module's compilation process.
 
+use crate::error::{Result, bail};
 use crate::prelude::*;
 use crate::{
     CompiledModuleInfo, DebugInfoData, FunctionName, MemoryInitialization, Metadata,
     ModuleTranslation, Tunables, obj,
 };
-use anyhow::{Result, bail};
 use object::SectionKind;
 use object::write::{Object, SectionId, StandardSegment, WritableBuffer};
 use std::ops::Range;

crates/environ/src/compile/module_environ.rs

@@ -1,3 +1,4 @@
+use crate::error::{Result, bail};
 use crate::module::{
     FuncRefIndex, Initializer, MemoryInitialization, MemoryInitializer, Module, TableSegment,
     TableSegmentElements,
@@ -11,7 +12,6 @@ use crate::{
     TypeIndex, WasmError, WasmHeapTopType, WasmHeapType, WasmResult, WasmValType,
     WasmparserTypeConverter,
 };
-use anyhow::{Result, bail};
 use cranelift_entity::SecondaryMap;
 use cranelift_entity::packed_option::ReservedValue;
 use std::borrow::Cow;

crates/environ/src/component/compiler.rs

@@ -1,6 +1,6 @@
 use crate::component::{ComponentTranslation, ComponentTypesBuilder, UnsafeIntrinsic};
+use crate::error::Result;
 use crate::{Abi, CompiledFunctionBody, FuncKey, Tunables};
-use anyhow::Result;
 
 /// Compilation support necessary for components.
 pub trait ComponentCompiler: Send + Sync {

crates/environ/src/component/dfg.rs

@@ -28,9 +28,9 @@
 //! fused adapters, what arguments make their way to core wasm modules, etc.
 
 use crate::component::*;
+use crate::error::Result;
 use crate::prelude::*;
 use crate::{EntityIndex, EntityRef, ModuleInternedTypeIndex, PrimaryMap, WasmValType};
-use anyhow::Result;
 use cranelift_entity::packed_option::PackedOption;
 use indexmap::IndexMap;
 use info::LinearMemoryOptions;

crates/environ/src/component/intrinsic.rs

@@ -2,7 +2,7 @@
 
 use core::str::FromStr;
 
-use anyhow::{Result, bail};
+use crate::error::{Result, bail};
 use serde_derive::{Deserialize, Serialize};
 
 /// Invoke a macro for each of our unsafe intrinsics.

crates/environ/src/component/names.rs

@@ -1,5 +1,5 @@
+use crate::error::{Result, bail};
 use crate::prelude::*;
-use anyhow::{Result, bail};
 use core::hash::Hash;
 use semver::Version;
 use serde_derive::{Deserialize, Serialize};

crates/environ/src/component/translate.rs

@@ -1,16 +1,16 @@
 use crate::Abi;
 use crate::component::dfg::AbstractInstantiations;
 use crate::component::*;
+use crate::error::Context;
+use crate::error::anyhow;
+use crate::error::ensure;
+use crate::error::{Result, bail};
 use crate::prelude::*;
 use crate::{
     EngineOrModuleTypeIndex, EntityIndex, FuncKey, ModuleEnvironment, ModuleInternedTypeIndex,
     ModuleTranslation, ModuleTypesBuilder, PrimaryMap, ScopeVec, TagIndex, Tunables, TypeConvert,
     WasmHeapType, WasmResult, WasmValType,
 };
-use anyhow::Context;
-use anyhow::anyhow;
-use anyhow::ensure;
-use anyhow::{Result, bail};
 use core::str::FromStr;
 use cranelift_entity::SecondaryMap;
 use cranelift_entity::packed_option::PackedOption;

crates/environ/src/component/types_builder.rs

@@ -1,10 +1,10 @@
 use crate::component::*;
+use crate::error::{Result, bail};
 use crate::prelude::*;
 use crate::{
     EngineOrModuleTypeIndex, EntityType, ModuleInternedTypeIndex, ModuleTypes, ModuleTypesBuilder,
     PrimaryMap, TypeConvert, WasmHeapType, WasmValType,
 };
-use anyhow::{Result, bail};
 use cranelift_entity::EntityRef;
 use std::collections::HashMap;
 use std::hash::Hash;