Skip to content

Commit ad83f40

Browse files
authored
Clippy fixes. (#1122)
Fix some miscellaneous warnings.
1 parent 60366ea commit ad83f40

File tree

7 files changed

+12
-13
lines changed

7 files changed

+12
-13
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,4 +278,5 @@ check-cfg = [
278278
'cfg(thumb_mode)',
279279
'cfg(wasi)',
280280
'cfg(wasi_ext)',
281+
'cfg(target_arch, values("xtensa"))',
281282
]

src/backend/linux_raw/conv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ pub(super) fn pass_usize<'a, Num: ArgNumber>(t: usize) -> ArgReg<'a, Num> {
107107

108108
impl<'a, Num: ArgNumber, T> From<*mut T> for ArgReg<'a, Num> {
109109
#[inline]
110-
fn from(c: *mut T) -> ArgReg<'a, Num> {
110+
fn from(c: *mut T) -> Self {
111111
raw_arg(c.cast())
112112
}
113113
}
114114

115115
impl<'a, Num: ArgNumber, T> From<*const T> for ArgReg<'a, Num> {
116116
#[inline]
117-
fn from(c: *const T) -> ArgReg<'a, Num> {
117+
fn from(c: *const T) -> Self {
118118
let mut_ptr = c as *mut T;
119119
raw_arg(mut_ptr.cast())
120120
}

src/backend/linux_raw/param/auxv.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,7 @@ fn init_auxv() {
270270
/// must be prepared for initialization to be skipped.
271271
#[cold]
272272
fn maybe_init_auxv() {
273-
if let Ok(()) = init_auxv_impl() {
274-
return;
275-
}
273+
let _ = init_auxv_impl();
276274
}
277275

278276
/// If we don't have "use-explicitly-provided-auxv" or "use-libc-auxv", we

src/backend/linux_raw/process/syscalls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ pub(crate) fn getrlimit(limit: Resource) -> Rlimit {
313313
#[inline]
314314
pub(crate) fn setrlimit(limit: Resource, new: Rlimit) -> io::Result<()> {
315315
unsafe {
316-
let lim = rlimit_to_linux(new.clone());
316+
let lim = rlimit_to_linux(new);
317317
match ret(syscall_readonly!(
318318
__NR_prlimit64,
319319
c_uint(0),

src/process/sched.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl fmt::Debug for CpuSet {
8080
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
8181
write!(fmt, "CpuSet {{")?;
8282
let mut first = true;
83-
for i in 0..CpuSet::MAX_CPU {
83+
for i in 0..Self::MAX_CPU {
8484
if self.is_set(i) {
8585
if first {
8686
write!(fmt, " ")?;
@@ -97,7 +97,7 @@ impl fmt::Debug for CpuSet {
9797

9898
impl hash::Hash for CpuSet {
9999
fn hash<H: hash::Hasher>(&self, state: &mut H) {
100-
for i in 0..CpuSet::MAX_CPU {
100+
for i in 0..Self::MAX_CPU {
101101
self.is_set(i).hash(state);
102102
}
103103
}

src/thread/clock.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ pub enum NanosleepRelativeResult {
103103
impl fmt::Debug for NanosleepRelativeResult {
104104
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
105105
match self {
106-
NanosleepRelativeResult::Ok => fmt.write_str("Ok"),
107-
NanosleepRelativeResult::Interrupted(remaining) => write!(
106+
Self::Ok => fmt.write_str("Ok"),
107+
Self::Interrupted(remaining) => write!(
108108
fmt,
109109
"Interrupted(Timespec {{ tv_sec: {:?}, tv_nsec: {:?} }})",
110110
remaining.tv_sec, remaining.tv_nsec
111111
),
112-
NanosleepRelativeResult::Err(err) => write!(fmt, "Err({:?})", err),
112+
Self::Err(err) => write!(fmt, "Err({:?})", err),
113113
}
114114
}
115115
}

tests/thread/futex.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ fn test_wait_wake() {
3838
move || {
3939
std::thread::sleep(std::time::Duration::from_millis(1));
4040
lock.store(1, Ordering::SeqCst);
41-
futex::wake(&lock, FutexFlags::empty(), 1);
41+
futex::wake(&lock, FutexFlags::empty(), 1).unwrap();
4242

4343
std::thread::sleep(std::time::Duration::from_millis(50));
4444
match futex::wait(&lock, FutexFlags::empty(), 1, None) {
@@ -58,7 +58,7 @@ fn test_wait_wake() {
5858
}
5959

6060
lock.store(2, Ordering::SeqCst);
61-
futex::wake(&lock, FutexFlags::empty(), 1);
61+
futex::wake(&lock, FutexFlags::empty(), 1).unwrap();
6262

6363
other.join().unwrap();
6464
}

0 commit comments

Comments
 (0)