diff --git a/cranelift/jit/src/backend.rs b/cranelift/jit/src/backend.rs index 418b26ef58..470e69cccd 100644 --- a/cranelift/jit/src/backend.rs +++ b/cranelift/jit/src/backend.rs @@ -596,15 +596,12 @@ impl Module for JITModule { ctx.import_global_value(ir::ExternalName::user(1, data.as_u32())) } - fn define_function( + fn define_function( &mut self, id: FuncId, ctx: &mut cranelift_codegen::Context, - trap_sink: &mut TS, - ) -> ModuleResult - where - TS: TrapSink, - { + trap_sink: &mut dyn TrapSink, + ) -> ModuleResult { info!("defining function {}: {}", id, ctx.func.display(self.isa())); let CodeInfo { total_size: code_size, diff --git a/cranelift/module/src/module.rs b/cranelift/module/src/module.rs index 2af5000568..60e2e2eb27 100644 --- a/cranelift/module/src/module.rs +++ b/cranelift/module/src/module.rs @@ -464,14 +464,12 @@ pub trait Module { /// Returns the size of the function's code and constant data. /// /// Note: After calling this function the given `Context` will contain the compiled function. - fn define_function( + fn define_function( &mut self, func: FuncId, ctx: &mut Context, - trap_sink: &mut TS, - ) -> ModuleResult - where - TS: binemit::TrapSink; + trap_sink: &mut dyn binemit::TrapSink, + ) -> ModuleResult; /// Define a function, taking the function body from the given `bytes`. /// @@ -559,15 +557,12 @@ impl Module for &mut M { (**self).declare_data_in_data(data, ctx) } - fn define_function( + fn define_function( &mut self, func: FuncId, ctx: &mut Context, - trap_sink: &mut TS, - ) -> ModuleResult - where - TS: binemit::TrapSink, - { + trap_sink: &mut dyn binemit::TrapSink, + ) -> ModuleResult { (**self).define_function(func, ctx, trap_sink) } diff --git a/cranelift/object/src/backend.rs b/cranelift/object/src/backend.rs index 98ab139a2f..b637718e2a 100644 --- a/cranelift/object/src/backend.rs +++ b/cranelift/object/src/backend.rs @@ -243,15 +243,12 @@ impl Module for ObjectModule { Ok(id) } - fn define_function( + fn define_function( &mut self, func_id: FuncId, ctx: &mut cranelift_codegen::Context, - trap_sink: &mut TS, - ) -> ModuleResult - where - TS: TrapSink, - { + trap_sink: &mut dyn TrapSink, + ) -> ModuleResult { info!( "defining function {}: {}", func_id,