fix a couple of clippy warnings

This commit is contained in:
Matthias Krüger 2024-01-05 22:40:25 +01:00
parent b0250fca19
commit 74987d04fc
6 changed files with 11 additions and 15 deletions

View File

@ -467,7 +467,7 @@ pub(crate) fn run_aot(
let cgu_name_builder = &mut CodegenUnitNameBuilder::new(tcx); let cgu_name_builder = &mut CodegenUnitNameBuilder::new(tcx);
let metadata_cgu_name = cgu_name_builder let metadata_cgu_name = cgu_name_builder
.build_cgu_name(LOCAL_CRATE, &["crate"], Some("metadata")) .build_cgu_name(LOCAL_CRATE, ["crate"], Some("metadata"))
.as_str() .as_str()
.to_string(); .to_string();

View File

@ -52,7 +52,7 @@ pub(crate) fn codegen_inline_asm_terminator<'tcx>(
} }
let operands = operands let operands = operands
.into_iter() .iter()
.map(|operand| match *operand { .map(|operand| match *operand {
InlineAsmOperand::In { reg, ref value } => CInlineAsmOperand::In { InlineAsmOperand::In { reg, ref value } => CInlineAsmOperand::In {
reg, reg,
@ -763,7 +763,7 @@ fn call_inline_asm<'tcx>(
}, },
) )
.unwrap(); .unwrap();
let inline_asm_func = fx.module.declare_func_in_func(inline_asm_func, &mut fx.bcx.func); let inline_asm_func = fx.module.declare_func_in_func(inline_asm_func, fx.bcx.func);
if fx.clif_comments.enabled() { if fx.clif_comments.enabled() {
fx.add_comment(inline_asm_func, asm_name); fx.add_comment(inline_asm_func, asm_name);
} }

View File

@ -293,7 +293,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
} }
ret.write_cvalue(fx, base); ret.write_cvalue(fx, base);
let ret_lane = ret.place_lane(fx, idx.try_into().unwrap()); let ret_lane = ret.place_lane(fx, idx.into());
ret_lane.write_cvalue(fx, val); ret_lane.write_cvalue(fx, val);
} }
@ -340,7 +340,7 @@ pub(super) fn codegen_simd_intrinsic_call<'tcx>(
); );
} }
let ret_lane = v.value_lane(fx, idx.try_into().unwrap()); let ret_lane = v.value_lane(fx, idx.into());
ret.write_cvalue(fx, ret_lane); ret.write_cvalue(fx, ret_lane);
} }

View File

@ -314,16 +314,13 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn isa::Tar
let flags = settings::Flags::new(flags_builder); let flags = settings::Flags::new(flags_builder);
let isa_builder = match sess.opts.cg.target_cpu.as_deref() { let isa_builder = match sess.opts.cg.target_cpu.as_deref() {
Some("native") => { Some("native") => cranelift_native::builder_with_options(true).unwrap(),
let builder = cranelift_native::builder_with_options(true).unwrap();
builder
}
Some(value) => { Some(value) => {
let mut builder = let mut builder =
cranelift_codegen::isa::lookup(target_triple.clone()).unwrap_or_else(|err| { cranelift_codegen::isa::lookup(target_triple.clone()).unwrap_or_else(|err| {
sess.dcx().fatal(format!("can't compile for {}: {}", target_triple, err)); sess.dcx().fatal(format!("can't compile for {}: {}", target_triple, err));
}); });
if let Err(_) = builder.enable(value) { if builder.enable(value).is_err() {
sess.dcx() sess.dcx()
.fatal("the specified target cpu isn't currently supported by Cranelift."); .fatal("the specified target cpu isn't currently supported by Cranelift.");
} }

View File

@ -28,10 +28,9 @@ pub(crate) fn unsized_info<'tcx>(
.bcx .bcx
.ins() .ins()
.iconst(fx.pointer_type, len.eval_target_usize(fx.tcx, ParamEnv::reveal_all()) as i64), .iconst(fx.pointer_type, len.eval_target_usize(fx.tcx, ParamEnv::reveal_all()) as i64),
( (&ty::Dynamic(data_a, _, src_dyn_kind), &ty::Dynamic(data_b, _, target_dyn_kind))
&ty::Dynamic(ref data_a, _, src_dyn_kind), if src_dyn_kind == target_dyn_kind =>
&ty::Dynamic(ref data_b, _, target_dyn_kind), {
) if src_dyn_kind == target_dyn_kind => {
let old_info = let old_info =
old_info.expect("unsized_info: missing old info for trait upcasting coercion"); old_info.expect("unsized_info: missing old info for trait upcasting coercion");
if data_a.principal_def_id() == data_b.principal_def_id() { if data_a.principal_def_id() == data_b.principal_def_id() {

View File

@ -95,7 +95,7 @@ pub(crate) fn get_vtable<'tcx>(
let alloc_id = fx.tcx.vtable_allocation((ty, trait_ref)); let alloc_id = fx.tcx.vtable_allocation((ty, trait_ref));
let data_id = let data_id =
data_id_for_alloc_id(&mut fx.constants_cx, &mut *fx.module, alloc_id, Mutability::Not); data_id_for_alloc_id(&mut fx.constants_cx, &mut *fx.module, alloc_id, Mutability::Not);
let local_data_id = fx.module.declare_data_in_func(data_id, &mut fx.bcx.func); let local_data_id = fx.module.declare_data_in_func(data_id, fx.bcx.func);
if fx.clif_comments.enabled() { if fx.clif_comments.enabled() {
fx.add_comment(local_data_id, format!("vtable: {:?}", alloc_id)); fx.add_comment(local_data_id, format!("vtable: {:?}", alloc_id));
} }