Fix a merge conflict

alexcrichton · alexcrichton · commit 557c720d8d26 · 2025-05-27T14:12:39.000-07:00
diff --git a/crates/cli-flags/src/lib.rs b/crates/cli-flags/src/lib.rs
@@ -999,9 +999,6 @@ impl CommonOptions {
             #[expect(deprecated, reason = "forwarding CLI flag")]
             config.wasm_legacy_exceptions(enable);
         }
-        if let Some(enable) = self.wasm.component_model_error_context.or(all) {
-            config.wasm_component_model_error_context(enable);
-        }
 
         macro_rules! handle_conditionally_compiled {
             ($(($feature:tt, $field:tt, $method:tt))*) => ($(

Original file line number	Diff line number	Diff line change
`@@ -999,9 +999,6 @@ impl CommonOptions {`
`999`	`999`	`#[expect(deprecated, reason = "forwarding CLI flag")]`
`1000`	`1000`	`config.wasm_legacy_exceptions(enable);`
`1001`	`1001`	`}`
`1002`		`- if let Some(enable) = self.wasm.component_model_error_context.or(all) {`
`1003`		`- config.wasm_component_model_error_context(enable);`
`1004`		`- }`
`1005`	`1002`
`1006`	`1003`	`macro_rules! handle_conditionally_compiled {`
`1007`	`1004`	`($(($feature:tt, $field:tt, $method:tt))*) => ($(`