Solve the future/errror binary spec discrepancy, fixes #2044 (#2045)

Author: cpetig

crates/wasm-encoder/src/component/types.rs

@@ -675,7 +675,7 @@ impl ComponentDefinedTypeEncoder<'_> {
 
     /// Define a `future` type with the specified payload.
     pub fn future(self, payload: Option<ComponentValType>) {
-        self.0.push(0x67);
+        self.0.push(0x65);
         payload.encode(self.0);
     }
 
@@ -687,7 +687,7 @@ impl ComponentDefinedTypeEncoder<'_> {
 
     /// Define the `error-context` type.
     pub fn error_context(self) {
-        self.0.push(0x65);
+        self.0.push(0x64);
     }
 }
 

crates/wasmparser/src/readers/component/types.rs

@@ -550,9 +550,9 @@ impl<'a> ComponentDefinedType<'a> {
             },
             0x69 => ComponentDefinedType::Own(reader.read()?),
             0x68 => ComponentDefinedType::Borrow(reader.read()?),
-            0x67 => ComponentDefinedType::Future(reader.read()?),
+            0x65 => ComponentDefinedType::Future(reader.read()?),
             0x66 => ComponentDefinedType::Stream(reader.read()?),
-            0x65 => ComponentDefinedType::ErrorContext,
+            0x64 => ComponentDefinedType::ErrorContext,
             x => return reader.invalid_leading_byte(x, "component defined type"),
         })
     }