More merge conflicts

Author: alexcrichton

crates/c-api/src/component/val.rs

@@ -169,6 +169,9 @@ impl From<&Val> for wasmtime_component_val_t {
             Val::Result(_val) => todo!(),
             Val::Flags(_items) => todo!(),
             Val::Resource(_resource_any) => todo!(),
+            Val::Future(_) => todo!(),
+            Val::Stream(_) => todo!(),
+            Val::ErrorContext(_) => todo!(),
         }
     }
 }

crates/test-programs/src/bin/async_error_context.rs

@@ -15,7 +15,7 @@ struct Component;
 
 impl Guest for Component {
     async fn run() {
-        let err_ctx = ErrorContext::new("error".into());
+        let err_ctx = ErrorContext::new("error");
         _ = err_ctx.debug_message();
     }
 }

crates/test-programs/src/bin/async_error_context_callee.rs

@@ -13,7 +13,7 @@ struct Component;
 
 impl bindings::exports::local::local::run_result::Guest for Component {
     async fn run_fail() -> Result<(), ErrorContext> {
-        Err(ErrorContext::new("error".into()))
+        Err(ErrorContext::new("error"))
     }
 
     async fn run_pass() -> Result<(), ErrorContext> {

crates/wasi-http/tests/all/p3/mod.rs

@@ -141,7 +141,7 @@ impl Client for TestClient {
         if let Some(rejected_authority) = &self.rejected_authority {
             let authority = request.uri().authority().map(ToString::to_string).unwrap();
             if &authority == rejected_authority {
-                return Ok(Err(ErrorCode::HttpRequestDenied.into()));
+                return Ok(Err(ErrorCode::HttpRequestDenied));
             }
         }
         Ok(default_send_request(request, options).await)

crates/wasi/src/p3/mod.rs

@@ -182,7 +182,7 @@ where
                 Some(Err(err)) => {
                     // TODO: Close the stream with an error context
                     drop(tx);
-                    break Err(err.into());
+                    break Err(err);
                 }
             }
         };

crates/wasmtime/src/runtime/component/concurrent/futures_and_streams.rs

@@ -218,10 +218,7 @@ fn accept_reader<T: func::Lower + Send + 'static, B: WriteBuffer<T>, U: 'static>
                 let mut store = token.as_context_mut(store);
                 let ptr = instance as *mut _;
                 let types = instance.component_types().clone();
-                let count = buffer
-                    .remaining()
-                    .len()
-                    .min(usize::try_from(count).unwrap());
+                let count = buffer.remaining().len().min(count);
 
                 store.with_attached_instance(instance, |mut store, _| {
                     // SAFETY: `ptr` is derived from `interface` and thus known
@@ -2528,8 +2525,8 @@ impl ComponentInstance {
                 ty,
                 flat_abi,
                 options,
-                address: usize::try_from(address).unwrap(),
-                count: usize::try_from(count).unwrap(),
+                address,
+                count,
                 handle,
                 post_write: PostWrite::Continue,
             };
@@ -2735,7 +2732,7 @@ impl ComponentInstance {
                 ty,
                 flat_abi,
                 options,
-                address: usize::try_from(address).unwrap(),
+                address,
                 count: usize::try_from(count).unwrap(),
                 handle,
             };
@@ -2849,7 +2846,7 @@ impl ComponentInstance {
                     Reader::Guest {
                         options: &options,
                         ty,
-                        address: usize::try_from(address).unwrap(),
+                        address,
                         count: count.try_into().unwrap(),
                     },
                 )?;