Skip to content

Commit e05f3da

Browse files
jeremyltjeremylt
committed
rust - satiate clippy
1 parent ddae6a0 commit e05f3da

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
@@ -306,7 +306,7 @@ impl Ceed {
306306

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

‎rust/libceed/src/operator.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<'a> OperatorField<'a> {
7676
///
7777
/// // Operator field arguments
7878
/// let ne = 3;
79-
/// let q = 4 as usize;
79+
/// let q = 4_usize;
8080
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
8181
/// for i in 0..ne {
8282
/// ind[2 * i + 0] = i as i32;
@@ -123,7 +123,7 @@ impl<'a> OperatorField<'a> {
123123
///
124124
/// // Operator field arguments
125125
/// let ne = 3;
126-
/// let q = 4 as usize;
126+
/// let q = 4_usize;
127127
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
128128
/// for i in 0..ne {
129129
/// ind[2 * i + 0] = i as i32;
@@ -195,7 +195,7 @@ impl<'a> OperatorField<'a> {
195195
///
196196
/// // Operator field arguments
197197
/// let ne = 3;
198-
/// let q = 4 as usize;
198+
/// let q = 4_usize;
199199
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
200200
/// for i in 0..ne {
201201
/// ind[2 * i + 0] = i as i32;
@@ -257,7 +257,7 @@ impl<'a> OperatorField<'a> {
257257
///
258258
/// // Operator field arguments
259259
/// let ne = 3;
260-
/// let q = 4 as usize;
260+
/// let q = 4_usize;
261261
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
262262
/// for i in 0..ne {
263263
/// ind[2 * i + 0] = i as i32;
@@ -355,7 +355,7 @@ impl<'a> fmt::Display for OperatorCore<'a> {
355355
///
356356
/// // Operator field arguments
357357
/// let ne = 3;
358-
/// let q = 4 as usize;
358+
/// let q = 4_usize;
359359
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
360360
/// for i in 0..ne {
361361
/// ind[2 * i + 0] = i as i32;
@@ -394,7 +394,7 @@ impl<'a> fmt::Display for Operator<'a> {
394394
///
395395
/// // Sub operator field arguments
396396
/// let ne = 3;
397-
/// let q = 4 as usize;
397+
/// let q = 4_usize;
398398
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
399399
/// for i in 0..ne {
400400
/// ind[2 * i + 0] = i as i32;
@@ -593,7 +593,7 @@ impl<'a> Operator<'a> {
593593
///
594594
/// // Operator field arguments
595595
/// let ne = 3;
596-
/// let q = 4 as usize;
596+
/// let q = 4_usize;
597597
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
598598
/// for i in 0..ne {
599599
/// ind[2 * i + 0] = i as i32;
@@ -817,7 +817,7 @@ impl<'a> Operator<'a> {
817817
v: impl Into<VectorOpt<'b>>,
818818
) -> crate::Result<Self> {
819819
let fieldname = CString::new(fieldname).expect("CString::new failed");
820-
let fieldname = fieldname.as_ptr() as *const i8;
820+
let fieldname = fieldname.as_ptr();
821821
let ierr = unsafe {
822822
bind_ceed::CeedOperatorSetField(
823823
self.op_core.ptr,
@@ -841,7 +841,7 @@ impl<'a> Operator<'a> {
841841
///
842842
/// // Operator field arguments
843843
/// let ne = 3;
844-
/// let q = 4 as usize;
844+
/// let q = 4_usize;
845845
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
846846
/// for i in 0..ne {
847847
/// ind[2 * i + 0] = i as i32;
@@ -876,7 +876,7 @@ impl<'a> Operator<'a> {
876876
&mut num_inputs,
877877
&mut inputs_ptr,
878878
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
879-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
879+
std::ptr::null_mut(),
880880
)
881881
};
882882
self.op_core.check_error(ierr)?;
@@ -913,7 +913,7 @@ impl<'a> Operator<'a> {
913913
///
914914
/// // Operator field arguments
915915
/// let ne = 3;
916-
/// let q = 4 as usize;
916+
/// let q = 4_usize;
917917
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
918918
/// for i in 0..ne {
919919
/// ind[2 * i + 0] = i as i32;
@@ -946,7 +946,7 @@ impl<'a> Operator<'a> {
946946
bind_ceed::CeedOperatorGetFields(
947947
self.op_core.ptr,
948948
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
949-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedOperatorField,
949+
std::ptr::null_mut(),
950950
&mut num_outputs,
951951
&mut outputs_ptr,
952952
)
@@ -2157,7 +2157,7 @@ impl<'a> CompositeOperator<'a> {
21572157
///
21582158
/// // Sub operator field arguments
21592159
/// let ne = 3;
2160-
/// let q = 4 as usize;
2160+
/// let q = 4_usize;
21612161
/// let mut ind: Vec<i32> = vec![0; 2 * ne];
21622162
/// for i in 0..ne {
21632163
/// 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

@@ -476,7 +476,7 @@ impl<'a> QFunctionCore<'a> {
476476
&mut num_inputs,
477477
&mut inputs_ptr,
478478
std::ptr::null_mut() as *mut bind_ceed::CeedInt,
479-
std::ptr::null_mut() as *mut *mut bind_ceed::CeedQFunctionField,
479+
std::ptr::null_mut(),
480480
)
481481
};
482482
self.check_error(ierr)?;
@@ -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
@@ -799,10 +799,7 @@ impl<'a> VectorView<'a> {
799799
)
800800
};
801801
vec.check_error(ierr)?;
802-
Ok(Self {
803-
vec: vec,
804-
array: array,
805-
})
802+
Ok(Self { vec, array })
806803
}
807804
}
808805

@@ -852,10 +849,7 @@ impl<'a> VectorViewMut<'a> {
852849
)
853850
};
854851
vec.check_error(ierr)?;
855-
Ok(Self {
856-
vec: vec,
857-
array: ptr,
858-
})
852+
Ok(Self { vec, array: ptr })
859853
}
860854
}
861855

0 commit comments

Comments
 (0)