Skip to content

Commit

Permalink
rust - satiate clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylt committed Nov 11, 2024
1 parent 64bc254 commit a3bf36a
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 55 deletions.
17 changes: 10 additions & 7 deletions examples/rust/ex1-volume/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,20 @@ fn example_1(options: opt::Opt) -> libceed::Result<()> {
quiet,
gallery,
} = options;
assert!(dim >= 1 && dim <= 3);
assert!((1..=3).contains(&dim));
assert!(mesh_degree >= 1);
assert!(solution_degree >= 1);
assert!(num_qpts >= 1);
let ncomp_x = dim;
let problem_size: i64;
if problem_size_requested < 0 {
problem_size = if test { 8 * 16 } else { 256 * 1024 };
let problem_size: i64 = if problem_size_requested < 0 {
if test {
8 * 16
} else {
256 * 1024
}
} else {
problem_size = problem_size_requested;
}
problem_size_requested
};

// Summary output
if !quiet {
Expand Down Expand Up @@ -102,7 +105,7 @@ fn example_1(options: opt::Opt) -> libceed::Result<()> {
if dim > 2 {
print!(", nz = {}", num_xyz[2]);
}
print!("\n");
println!();
}

// Build ElemRestriction objects describing the mesh and solution discrete
Expand Down
15 changes: 7 additions & 8 deletions examples/rust/ex2-surface/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,20 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
quiet,
gallery,
} = options;
assert!(dim >= 1 && dim <= 3);
assert!((0..=3).contains(&dim));
assert!(mesh_degree >= 1);
assert!(solution_degree >= 1);
assert!(num_qpts >= 1);
let ncomp_x = dim;
let problem_size: i64;
if problem_size_requested < 0 {
problem_size = if test {
let problem_size: i64 = if problem_size_requested < 0 {
if test {
16 * 16 * (dim * dim) as i64
} else {
256 * 1024
};
}
} else {
problem_size = problem_size_requested;
}
problem_size_requested
};

// Summary output
if !quiet {
Expand Down Expand Up @@ -107,7 +106,7 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
if dim > 2 {
print!(", nz = {}", num_xyz[2]);
}
print!("\n");
println!();
}

// Build ElemRestriction objects describing the mesh and solution discrete
Expand Down
17 changes: 10 additions & 7 deletions examples/rust/ex3-vector-volume/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,20 @@ fn example_3(options: opt::Opt) -> libceed::Result<()> {
quiet,
gallery,
} = options;
assert!(dim >= 1 && dim <= 3);
assert!((0..=3).contains(&dim));
assert!(mesh_degree >= 1);
assert!(solution_degree >= 1);
assert!(num_qpts >= 1);
let ncomp_x = dim;
let problem_size: i64;
if problem_size_requested < 0 {
problem_size = if test { 8 * 16 } else { 256 * 1024 };
let problem_size: i64 = if problem_size_requested < 0 {
if test {
8 * 16
} else {
256 * 1024
}
} else {
problem_size = problem_size_requested;
}
problem_size_requested
};
let ncomp_u = 3;

// Summary output
Expand Down Expand Up @@ -104,7 +107,7 @@ fn example_3(options: opt::Opt) -> libceed::Result<()> {
if dim > 2 {
print!(", nz = {}", num_xyz[2]);
}
print!("\n");
println!();
}

// Build ElemRestriction objects describing the mesh and solution discrete
Expand Down
15 changes: 7 additions & 8 deletions examples/rust/ex4-vector-surface/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,20 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
quiet,
gallery,
} = options;
assert!(dim >= 1 && dim <= 3);
assert!((0..=3).contains(&dim));
assert!(mesh_degree >= 1);
assert!(solution_degree >= 1);
assert!(num_qpts >= 1);
let ncomp_x = dim;
let problem_size: i64;
if problem_size_requested < 0 {
problem_size = if test {
let problem_size: i64 = if problem_size_requested < 0 {
if test {
16 * 16 * (dim * dim) as i64
} else {
256 * 1024
};
}
} else {
problem_size = problem_size_requested;
}
problem_size_requested
};
let ncomp_u = 3;

// Summary output
Expand Down Expand Up @@ -109,7 +108,7 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
if dim > 2 {
print!(", nz = {}", num_xyz[2]);
}
print!("\n");
println!();
}

// Build ElemRestriction objects describing the mesh and solution discrete
Expand Down
2 changes: 1 addition & 1 deletion rust/libceed/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ impl Ceed {

// Call to libCEED
let mut ptr = std::ptr::null_mut();
let mut ierr = unsafe { bind_ceed::CeedInit(c_resource.as_ptr() as *const i8, &mut ptr) };
let mut ierr = unsafe { bind_ceed::CeedInit(c_resource.as_ptr(), &mut ptr) };
if ierr != 0 {
panic!("Error initializing backend resource: {}", resource)
}
Expand Down
26 changes: 13 additions & 13 deletions rust/libceed/src/operator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl<'a> OperatorField<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -121,7 +121,7 @@ impl<'a> OperatorField<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -193,7 +193,7 @@ impl<'a> OperatorField<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -255,7 +255,7 @@ impl<'a> OperatorField<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -353,7 +353,7 @@ impl<'a> fmt::Display for OperatorCore<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -392,7 +392,7 @@ impl<'a> fmt::Display for Operator<'a> {
///
/// // Sub operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -584,7 +584,7 @@ impl<'a> Operator<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -808,7 +808,7 @@ impl<'a> Operator<'a> {
v: impl Into<VectorOpt<'b>>,
) -> crate::Result<Self> {
let fieldname = CString::new(fieldname).expect("CString::new failed");
let fieldname = fieldname.as_ptr() as *const i8;
let fieldname = fieldname.as_ptr();
self.op_core.check_error(unsafe {
bind_ceed::CeedOperatorSetField(
self.op_core.ptr,
Expand All @@ -831,7 +831,7 @@ impl<'a> Operator<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -866,7 +866,7 @@ impl<'a> Operator<'a> {
&mut num_inputs,
&mut inputs_ptr,
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
std::ptr::null_mut(),
)
})?;
// Convert raw C pointers to fixed length slice
Expand Down Expand Up @@ -901,7 +901,7 @@ impl<'a> Operator<'a> {
///
/// // Operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down Expand Up @@ -934,7 +934,7 @@ impl<'a> Operator<'a> {
bind_ceed::CeedOperatorGetFields(
self.op_core.ptr,
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
std::ptr::null_mut(),
&mut num_outputs,
&mut outputs_ptr,
)
Expand Down Expand Up @@ -2139,7 +2139,7 @@ impl<'a> CompositeOperator<'a> {
///
/// // Sub operator field arguments
/// let ne = 3;
/// let q = 4 as usize;
/// let q = 4_usize;
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
/// for i in 0..ne {
/// ind[2 * i + 0] = i as i32;
Expand Down
6 changes: 3 additions & 3 deletions rust/libceed/src/qfunction.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl<'a> QFunctionField<'a> {
unsafe {
bind_ceed::CeedQFunctionFieldGetEvalMode(self.ptr, &mut mode);
}
crate::EvalMode::from_u32(mode as u32)
crate::EvalMode::from_u32(mode)
}
}

Expand Down Expand Up @@ -477,7 +477,7 @@ impl<'a> QFunctionCore<'a> {
&mut num_inputs,
&mut inputs_ptr,
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
std::ptr::null_mut() as *mut *mut bind_ceed::CeedQFunctionField,
std::ptr::null_mut(),
)
})?;
// Convert raw C pointers to fixed length slice
Expand All @@ -495,7 +495,7 @@ impl<'a> QFunctionCore<'a> {
bind_ceed::CeedQFunctionGetFields(
self.ptr,
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
std::ptr::null_mut() as *mut *mut bind_ceed::CeedQFunctionField,
std::ptr::null_mut(),
&mut num_outputs,
&mut outputs_ptr,
)
Expand Down
10 changes: 2 additions & 8 deletions rust/libceed/src/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -787,10 +787,7 @@ impl<'a> VectorView<'a> {
&mut array,
)
})?;
Ok(Self {
vec: vec,
array: array,
})
Ok(Self { vec, array })
}
}

Expand Down Expand Up @@ -839,10 +836,7 @@ impl<'a> VectorViewMut<'a> {
&mut ptr,
)
})?;
Ok(Self {
vec: vec,
array: ptr,
})
Ok(Self { vec, array: ptr })
}
}

Expand Down

0 comments on commit a3bf36a

Please sign in to comment.