Skip to content

Commit 31a665d

Browse files
jeremyltjeremylt
committed
rust - satiate clippy
1 parent b2742d1 commit 31a665d

File tree

8 files changed

+53
-55
lines changed

8 files changed

+53
-55
lines changed

‎examples/rust/ex1-volume/src/main.rs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,20 @@ fn example_1(options: opt::Opt) -> libceed::Result<()> {
4646
quiet,
4747
gallery,
4848
} = options;
49-
assert!(dim >= 1 && dim <= 3);
49+
assert!((1..=3).contains(&dim));
5050
assert!(mesh_degree >= 1);
5151
assert!(solution_degree >= 1);
5252
assert!(num_qpts >= 1);
5353
let ncomp_x = dim;
54-
let problem_size: i64;
55-
if problem_size_requested < 0 {
56-
problem_size = if test { 8 * 16 } else { 256 * 1024 };
54+
let problem_size: i64 = if problem_size_requested < 0 {
55+
if test {
56+
8 * 16
57+
} else {
58+
256 * 1024
59+
}
5760
} else {
58-
problem_size = problem_size_requested;
59-
}
61+
problem_size_requested
62+
};
6063

6164
// Summary output
6265
if !quiet {
@@ -102,7 +105,7 @@ fn example_1(options: opt::Opt) -> libceed::Result<()> {
102105
if dim > 2 {
103106
print!(", nz = {}", num_xyz[2]);
104107
}
105-
print!("\n");
108+
println!();
106109
}
107110

108111
// Build ElemRestriction objects describing the mesh and solution discrete

‎examples/rust/ex2-surface/src/main.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,20 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
4747
quiet,
4848
gallery,
4949
} = options;
50-
assert!(dim >= 1 && dim <= 3);
50+
assert!((0..=3).contains(&dim));
5151
assert!(mesh_degree >= 1);
5252
assert!(solution_degree >= 1);
5353
assert!(num_qpts >= 1);
5454
let ncomp_x = dim;
55-
let problem_size: i64;
56-
if problem_size_requested < 0 {
57-
problem_size = if test {
55+
let problem_size: i64 = if problem_size_requested < 0 {
56+
if test {
5857
16 * 16 * (dim * dim) as i64
5958
} else {
6059
256 * 1024
61-
};
60+
}
6261
} else {
63-
problem_size = problem_size_requested;
64-
}
62+
problem_size_requested
63+
};
6564

6665
// Summary output
6766
if !quiet {
@@ -107,7 +106,7 @@ fn example_2(options: opt::Opt) -> libceed::Result<()> {
107106
if dim > 2 {
108107
print!(", nz = {}", num_xyz[2]);
109108
}
110-
print!("\n");
109+
println!();
111110
}
112111

113112
// Build ElemRestriction objects describing the mesh and solution discrete

‎examples/rust/ex3-vector-volume/src/main.rs‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,20 @@ fn example_3(options: opt::Opt) -> libceed::Result<()> {
4747
quiet,
4848
gallery,
4949
} = options;
50-
assert!(dim >= 1 && dim <= 3);
50+
assert!((0..=3).contains(&dim));
5151
assert!(mesh_degree >= 1);
5252
assert!(solution_degree >= 1);
5353
assert!(num_qpts >= 1);
5454
let ncomp_x = dim;
55-
let problem_size: i64;
56-
if problem_size_requested < 0 {
57-
problem_size = if test { 8 * 16 } else { 256 * 1024 };
55+
let problem_size: i64 = if problem_size_requested < 0 {
56+
if test {
57+
8 * 16
58+
} else {
59+
256 * 1024
60+
}
5861
} else {
59-
problem_size = problem_size_requested;
60-
}
62+
problem_size_requested
63+
};
6164
let ncomp_u = 3;
6265

6366
// Summary output
@@ -104,7 +107,7 @@ fn example_3(options: opt::Opt) -> libceed::Result<()> {
104107
if dim > 2 {
105108
print!(", nz = {}", num_xyz[2]);
106109
}
107-
print!("\n");
110+
println!();
108111
}
109112

110113
// Build ElemRestriction objects describing the mesh and solution discrete

‎examples/rust/ex4-vector-surface/src/main.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,20 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
4848
quiet,
4949
gallery,
5050
} = options;
51-
assert!(dim >= 1 && dim <= 3);
51+
assert!((0..=3).contains(&dim));
5252
assert!(mesh_degree >= 1);
5353
assert!(solution_degree >= 1);
5454
assert!(num_qpts >= 1);
5555
let ncomp_x = dim;
56-
let problem_size: i64;
57-
if problem_size_requested < 0 {
58-
problem_size = if test {
56+
let problem_size: i64 = if problem_size_requested < 0 {
57+
if test {
5958
16 * 16 * (dim * dim) as i64
6059
} else {
6160
256 * 1024
62-
};
61+
}
6362
} else {
64-
problem_size = problem_size_requested;
65-
}
63+
problem_size_requested
64+
};
6665
let ncomp_u = 3;
6766

6867
// Summary output
@@ -109,7 +108,7 @@ fn example_4(options: opt::Opt) -> libceed::Result<()> {
109108
if dim > 2 {
110109
print!(", nz = {}", num_xyz[2]);
111110
}
112-
print!("\n");
111+
println!();
113112
}
114113

115114
// Build ElemRestriction objects describing the mesh and solution discrete

‎rust/libceed/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ impl Ceed {
309309

310310
// Call to libCEED
311311
let mut ptr = std::ptr::null_mut();
312-
let mut ierr = unsafe { bind_ceed::CeedInit(c_resource.as_ptr() as *const i8, &mut ptr) };
312+
let mut ierr = unsafe { bind_ceed::CeedInit(c_resource.as_ptr(), &mut ptr) };
313313
if ierr != 0 {
314314
panic!("Error initializing backend resource: {}", resource)
315315
}

‎rust/libceed/src/operator.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ impl<'a> OperatorField<'a> {
7474
///
7575
/// // Operator field arguments
7676
/// let ne = 3;
77-
/// let q = 4 as usize;
77+
/// let q = 4_usize;
7878
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
7979
/// for i in 0..ne {
8080
/// ind[2 * i + 0] = i as i32;
@@ -121,7 +121,7 @@ impl<'a> OperatorField<'a> {
121121
///
122122
/// // Operator field arguments
123123
/// let ne = 3;
124-
/// let q = 4 as usize;
124+
/// let q = 4_usize;
125125
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
126126
/// for i in 0..ne {
127127
/// ind[2 * i + 0] = i as i32;
@@ -193,7 +193,7 @@ impl<'a> OperatorField<'a> {
193193
///
194194
/// // Operator field arguments
195195
/// let ne = 3;
196-
/// let q = 4 as usize;
196+
/// let q = 4_usize;
197197
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
198198
/// for i in 0..ne {
199199
/// ind[2 * i + 0] = i as i32;
@@ -255,7 +255,7 @@ impl<'a> OperatorField<'a> {
255255
///
256256
/// // Operator field arguments
257257
/// let ne = 3;
258-
/// let q = 4 as usize;
258+
/// let q = 4_usize;
259259
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
260260
/// for i in 0..ne {
261261
/// ind[2 * i + 0] = i as i32;
@@ -353,7 +353,7 @@ impl<'a> fmt::Display for OperatorCore<'a> {
353353
///
354354
/// // Operator field arguments
355355
/// let ne = 3;
356-
/// let q = 4 as usize;
356+
/// let q = 4_usize;
357357
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
358358
/// for i in 0..ne {
359359
/// ind[2 * i + 0] = i as i32;
@@ -392,7 +392,7 @@ impl<'a> fmt::Display for Operator<'a> {
392392
///
393393
/// // Sub operator field arguments
394394
/// let ne = 3;
395-
/// let q = 4 as usize;
395+
/// let q = 4_usize;
396396
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
397397
/// for i in 0..ne {
398398
/// ind[2 * i + 0] = i as i32;
@@ -584,7 +584,7 @@ impl<'a> Operator<'a> {
584584
///
585585
/// // Operator field arguments
586586
/// let ne = 3;
587-
/// let q = 4 as usize;
587+
/// let q = 4_usize;
588588
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
589589
/// for i in 0..ne {
590590
/// ind[2 * i + 0] = i as i32;
@@ -808,7 +808,7 @@ impl<'a> Operator<'a> {
808808
v: impl Into<VectorOpt<'b>>,
809809
) -> crate::Result<Self> {
810810
let fieldname = CString::new(fieldname).expect("CString::new failed");
811-
let fieldname = fieldname.as_ptr() as *const i8;
811+
let fieldname = fieldname.as_ptr();
812812
self.op_core.check_error(unsafe {
813813
bind_ceed::CeedOperatorSetField(
814814
self.op_core.ptr,
@@ -831,7 +831,7 @@ impl<'a> Operator<'a> {
831831
///
832832
/// // Operator field arguments
833833
/// let ne = 3;
834-
/// let q = 4 as usize;
834+
/// let q = 4_usize;
835835
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
836836
/// for i in 0..ne {
837837
/// ind[2 * i + 0] = i as i32;
@@ -866,7 +866,7 @@ impl<'a> Operator<'a> {
866866
&mut num_inputs,
867867
&mut inputs_ptr,
868868
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
869-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
869+
std::ptr::null_mut(),
870870
)
871871
})?;
872872
// Convert raw C pointers to fixed length slice
@@ -901,7 +901,7 @@ impl<'a> Operator<'a> {
901901
///
902902
/// // Operator field arguments
903903
/// let ne = 3;
904-
/// let q = 4 as usize;
904+
/// let q = 4_usize;
905905
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
906906
/// for i in 0..ne {
907907
/// ind[2 * i + 0] = i as i32;
@@ -934,7 +934,7 @@ impl<'a> Operator<'a> {
934934
bind_ceed::CeedOperatorGetFields(
935935
self.op_core.ptr,
936936
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
937-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
937+
std::ptr::null_mut(),
938938
&mut num_outputs,
939939
&mut outputs_ptr,
940940
)
@@ -2139,7 +2139,7 @@ impl<'a> CompositeOperator<'a> {
21392139
///
21402140
/// // Sub operator field arguments
21412141
/// let ne = 3;
2142-
/// let q = 4 as usize;
2142+
/// let q = 4_usize;
21432143
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
21442144
/// for i in 0..ne {
21452145
/// ind[2 * i + 0] = i as i32;

‎rust/libceed/src/qfunction.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl<'a> QFunctionField<'a> {
108108
unsafe {
109109
bind_ceed::CeedQFunctionFieldGetEvalMode(self.ptr, &mut mode);
110110
}
111-
crate::EvalMode::from_u32(mode as u32)
111+
crate::EvalMode::from_u32(mode)
112112
}
113113
}
114114

@@ -477,7 +477,7 @@ impl<'a> QFunctionCore<'a> {
477477
&mut num_inputs,
478478
&mut inputs_ptr,
479479
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
480-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedQFunctionField,
480+
std::ptr::null_mut(),
481481
)
482482
})?;
483483
// Convert raw C pointers to fixed length slice
@@ -495,7 +495,7 @@ impl<'a> QFunctionCore<'a> {
495495
bind_ceed::CeedQFunctionGetFields(
496496
self.ptr,
497497
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
498-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedQFunctionField,
498+
std::ptr::null_mut(),
499499
&mut num_outputs,
500500
&mut outputs_ptr,
501501
)

‎rust/libceed/src/vector.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -787,10 +787,7 @@ impl<'a> VectorView<'a> {
787787
&mut array,
788788
)
789789
})?;
790-
Ok(Self {
791-
vec: vec,
792-
array: array,
793-
})
790+
Ok(Self { vec, array })
794791
}
795792
}
796793

@@ -839,10 +836,7 @@ impl<'a> VectorViewMut<'a> {
839836
&mut ptr,
840837
)
841838
})?;
842-
Ok(Self {
843-
vec: vec,
844-
array: ptr,
845-
})
839+
Ok(Self { vec, array: ptr })
846840
}
847841
}
848842

0 commit comments

Comments
 (0)