Fold the wasmtime-error crate into wasmtime-core (bytecodealliance#12418)

Similar to bytecodealliance#12398 and bytecodealliance#12407 the idea is that all our dependency-free
(mostly) data structures and foundational data-types are in one location
to centralize testing, ergonomics, documentation, idioms, etc.

Author: alexcrichton

.github/workflows/main.yml

@@ -1177,8 +1177,6 @@ jobs:
           - crate: "wasmtime-cli"
           - crate: "wasmtime-environ --all-features"
           - crate: "pulley-interpreter --all-features"
-          - crate: "wasmtime-internal-error"
-          - crate: "wasmtime-internal-error --all-features"
           - crate: "wasmtime-internal-core"
           - crate: "wasmtime-internal-core --all-features"
           - script: ./ci/miri-provenance-test.sh

Cargo.lock

@@ -158,9 +158,7 @@ members = [
   "cranelift/serde",
   "crates/bench-api",
   "crates/c-api/artifact",
-  "crates/core",
   "crates/environ/fuzz",
-  "crates/error",
   "crates/misc/component-async-tests",
   "crates/test-programs",
   "crates/wasi-preview1-component-adapter",
@@ -265,7 +263,6 @@ wasmtime-wast = { path = "crates/wast", version = "=42.0.0" }
 # part of the project organization of other public crates in Wasmtime and are
 # otherwise not supported in terms of CVEs for example.
 wasmtime-core = { path = "crates/core", version = "=42.0.0", package = 'wasmtime-internal-core' }
-wasmtime-error = { path = "crates/error", version = "=42.0.0", package = 'wasmtime-internal-error' }
 wasmtime-wmemcheck = { path = "crates/wmemcheck", version = "=42.0.0", package = 'wasmtime-internal-wmemcheck' }
 wasmtime-c-api-macros = { path = "crates/c-api-macros", version = "=42.0.0", package = 'wasmtime-internal-c-api-macros' }
 wasmtime-cache = { path = "crates/cache", version = "=42.0.0", package = 'wasmtime-internal-cache' }

Cargo.toml

@@ -16,7 +16,6 @@ workspace = true
 arbitrary = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
-wasmtime-error = { workspace = true }
 wasmtime-core = { workspace = true }
 
 [features]

cranelift/bitset/Cargo.toml

@@ -3,7 +3,7 @@
 use crate::scalar::{self, ScalarBitSet, ScalarBitSetStorage};
 use alloc::boxed::Box;
 use core::{cmp, iter, mem};
-use wasmtime_error::OutOfMemory;
+use wasmtime_core::error::OutOfMemory;
 
 /// A large bit set backed by dynamically-sized storage.
 ///

cranelift/bitset/src/compound.rs

@@ -19,7 +19,7 @@ workspace = true
 cranelift-bitset = { workspace=true }
 serde = { workspace = true, optional = true }
 serde_derive = { workspace = true, optional = true }
-wasmtime-error = { workspace = true }
+wasmtime-core = { workspace = true }
 
 [features]
 enable-serde = ["serde", "serde_derive", "cranelift-bitset/enable-serde"]

cranelift/entity/Cargo.toml

@@ -11,7 +11,7 @@ use core::ops::{Index, IndexMut};
 use core::slice;
 #[cfg(feature = "enable-serde")]
 use serde_derive::{Deserialize, Serialize};
-use wasmtime_error::OutOfMemory;
+use wasmtime_core::error::OutOfMemory;
 
 /// A primary mapping `K -> V` allocating dense entity references.
 ///

cranelift/entity/src/primary.rs

@@ -5,7 +5,7 @@ use crate::keys::Keys;
 use core::fmt;
 use core::marker::PhantomData;
 use cranelift_bitset::CompoundBitSet;
-use wasmtime_error::OutOfMemory;
+use wasmtime_core::error::OutOfMemory;
 
 /// A set of `K` for densely indexed entity references.
 ///

cranelift/entity/src/set.rs

@@ -10,11 +10,17 @@ version.workspace = true
 [dependencies]
 # This crate should have *very* minimal dependencies! Don't add new ones
 # lightly.
-wasmtime-error = { workspace = true }
 libm = { workspace = true }
+anyhow = { workspace = true, optional = true }
 
 [lints]
 workspace = true
 
 [features]
+# Enable the use of the `std` crate.
 std = []
+# Enable backtraces in errors.
+backtrace = ["std"]
+# Enable the `From<Error> for anyhow::Error` implementation and
+# `Error::from_anyhow` constructor.
+anyhow = ["dep:anyhow"]

crates/core/Cargo.toml

@@ -7,8 +7,8 @@ mod try_new;
 pub use boxed::{BoxedSliceFromIterError, new_boxed_slice_from_iter};
 pub use try_new::{TryNew, try_new};
 
+use crate::error::OutOfMemory;
 use core::{alloc::Layout, ptr::NonNull};
-use wasmtime_error::OutOfMemory;
 
 /// Try to allocate a block of memory that fits the given layout, or return an
 /// `OutOfMemory` error.