Skip to content

Commit 447a6ba

Browse files
authored
Merge pull request #43 from rust-lang/fix/clippy
Fix clippy warnings
2 parents 9ae0279 + 8b2d3e3 commit 447a6ba

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

src/block.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ impl<'ctx> Block<'ctx> {
175175
};
176176
unsafe {
177177
gccjit_sys::gcc_jit_block_add_assignment_op(self.ptr,
178-
loc_ptr,
179-
lvalue::get_ptr(&lvalue),
180-
mem::transmute(op),
181-
rvalue::get_ptr(&rvalue));
178+
loc_ptr,
179+
lvalue::get_ptr(&lvalue),
180+
mem::transmute::<BinaryOp, gccjit_sys::gcc_jit_binary_op>(op),
181+
rvalue::get_ptr(&rvalue));
182182
}
183183
}
184184

src/context.rs

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::ffi::{CStr, CString};
1+
use std::ffi::{c_void, CStr, CString};
22
use std::marker::PhantomData;
33
use std::mem;
44
use std::os::raw::{c_int, c_ulong};
@@ -279,8 +279,8 @@ impl<'ctx> Context<'ctx> {
279279
let file_ref = file.as_ref();
280280
let cstr = CString::new(file_ref).unwrap();
281281
gccjit_sys::gcc_jit_context_compile_to_file(self.ptr,
282-
mem::transmute(kind),
283-
cstr.as_ptr());
282+
mem::transmute::<OutputKind, gccjit_sys::gcc_jit_output_kind>(kind),
283+
cstr.as_ptr());
284284
}
285285
}
286286

@@ -352,7 +352,7 @@ impl<'ctx> Context<'ctx> {
352352
let ptr = gccjit_sys::gcc_jit_context_new_global(
353353
self.ptr,
354354
loc_ptr,
355-
mem::transmute(kind),
355+
mem::transmute::<GlobalKind, gccjit_sys::gcc_jit_global_kind>(kind),
356356
types::get_ptr(&ty),
357357
cstr.as_ptr());
358358
#[cfg(debug_assertions)]
@@ -590,13 +590,13 @@ impl<'ctx> Context<'ctx> {
590590
unsafe {
591591
let cstr = CString::new(name_ref).unwrap();
592592
let ptr = gccjit_sys::gcc_jit_context_new_function(self.ptr,
593-
loc_ptr,
594-
mem::transmute(kind),
595-
types::get_ptr(&return_ty),
596-
cstr.as_ptr(),
597-
num_params,
598-
params_ptrs.as_mut_ptr(),
599-
is_variadic as i32);
593+
loc_ptr,
594+
mem::transmute::<FunctionType, gccjit_sys::gcc_jit_function_kind>(kind),
595+
types::get_ptr(&return_ty),
596+
cstr.as_ptr(),
597+
num_params,
598+
params_ptrs.as_mut_ptr(),
599+
is_variadic as i32);
600600
#[cfg(debug_assertions)]
601601
if let Ok(Some(error)) = self.get_last_error() {
602602
panic!("{}", error);
@@ -620,11 +620,11 @@ impl<'ctx> Context<'ctx> {
620620
};
621621
unsafe {
622622
let ptr = gccjit_sys::gcc_jit_context_new_binary_op(self.ptr,
623-
loc_ptr,
624-
mem::transmute(op),
625-
types::get_ptr(&ty),
626-
rvalue::get_ptr(&left_rvalue),
627-
rvalue::get_ptr(&right_rvalue));
623+
loc_ptr,
624+
mem::transmute::<BinaryOp, gccjit_sys::gcc_jit_binary_op>(op),
625+
types::get_ptr(&ty),
626+
rvalue::get_ptr(&left_rvalue),
627+
rvalue::get_ptr(&right_rvalue));
628628
#[cfg(debug_assertions)]
629629
if let Ok(Some(error)) = self.get_last_error() {
630630
panic!("{}", error);
@@ -646,10 +646,10 @@ impl<'ctx> Context<'ctx> {
646646
};
647647
unsafe {
648648
let ptr = gccjit_sys::gcc_jit_context_new_unary_op(self.ptr,
649-
loc_ptr,
650-
mem::transmute(op),
651-
types::get_ptr(&ty),
652-
rvalue::get_ptr(&rvalue));
649+
loc_ptr,
650+
mem::transmute::<UnaryOp, gccjit_sys::gcc_jit_unary_op>(op),
651+
types::get_ptr(&ty),
652+
rvalue::get_ptr(&rvalue));
653653
#[cfg(debug_assertions)]
654654
if let Ok(Some(error)) = self.get_last_error() {
655655
panic!("{}", error);
@@ -671,10 +671,10 @@ impl<'ctx> Context<'ctx> {
671671
};
672672
unsafe {
673673
let ptr = gccjit_sys::gcc_jit_context_new_comparison(self.ptr,
674-
loc_ptr,
675-
mem::transmute(op),
676-
rvalue::get_ptr(&left_rvalue),
677-
rvalue::get_ptr(&right_rvalue));
674+
loc_ptr,
675+
mem::transmute::<ComparisonOp, gccjit_sys::gcc_jit_comparison>(op),
676+
rvalue::get_ptr(&left_rvalue),
677+
rvalue::get_ptr(&right_rvalue));
678678
#[cfg(debug_assertions)]
679679
if let Ok(Some(error)) = self.get_last_error() {
680680
panic!("{}", error);
@@ -1007,8 +1007,8 @@ impl<'ctx> Context<'ctx> {
10071007
value: *mut ()) -> RValue<'a> {
10081008
unsafe {
10091009
let ptr = gccjit_sys::gcc_jit_context_new_rvalue_from_ptr(self.ptr,
1010-
types::get_ptr(&ty),
1011-
mem::transmute(value));
1010+
types::get_ptr(&ty),
1011+
mem::transmute::<*mut (), *mut c_void>(value));
10121012
#[cfg(debug_assertions)]
10131013
if let Ok(Some(error)) = self.get_last_error() {
10141014
panic!("{}", error);

src/rvalue.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ macro_rules! binary_operator_for {
6464
let ctx_ptr = gccjit_sys::gcc_jit_object_get_context(obj_ptr);
6565
let ty = rhs.get_type();
6666
let ptr = gccjit_sys::gcc_jit_context_new_binary_op(ctx_ptr,
67-
ptr::null_mut(),
68-
mem::transmute($op),
69-
types::get_ptr(&ty),
70-
self.ptr,
71-
rhs_rvalue.ptr);
67+
ptr::null_mut(),
68+
mem::transmute::<BinaryOp, gccjit_sys::gcc_jit_binary_op>($op),
69+
types::get_ptr(&ty),
70+
self.ptr,
71+
rhs_rvalue.ptr);
7272
#[cfg(debug_assertions)]
7373
if let Ok(Some(error)) = self.to_object().get_context().get_last_error() {
7474
panic!("{}", error);

0 commit comments

Comments
 (0)