Skip to content

Commit

Permalink
Apply clippy::needless_return suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
mati865 committed Oct 22, 2019
1 parent dffc1b3 commit 95c06a2
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/liballoc/collections/vec_deque.rs
Expand Up @@ -1817,7 +1817,7 @@ impl<T> VecDeque<T> {
}
}

return elem;
elem
}

/// Splits the `VecDeque` into two at the given index.
Expand Down
2 changes: 1 addition & 1 deletion src/liballoc/str.rs
Expand Up @@ -456,7 +456,7 @@ impl str {
}
}
}
return s;
s
}

/// Converts a [`Box<str>`] into a [`String`] without copying or allocating.
Expand Down
2 changes: 1 addition & 1 deletion src/liballoc/sync.rs
Expand Up @@ -1638,7 +1638,7 @@ impl<T: ?Sized> Clone for Weak<T> {
}
}

return Weak { ptr: self.ptr };
Weak { ptr: self.ptr }
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/libpanic_unwind/gcc.rs
Expand Up @@ -156,21 +156,21 @@ unsafe extern "C" fn rust_eh_personality(version: c_int,
if actions as i32 & uw::_UA_SEARCH_PHASE as i32 != 0 {
match eh_action {
EHAction::None |
EHAction::Cleanup(_) => return uw::_URC_CONTINUE_UNWIND,
EHAction::Catch(_) => return uw::_URC_HANDLER_FOUND,
EHAction::Terminate => return uw::_URC_FATAL_PHASE1_ERROR,
EHAction::Cleanup(_) => uw::_URC_CONTINUE_UNWIND,
EHAction::Catch(_) => uw::_URC_HANDLER_FOUND,
EHAction::Terminate => uw::_URC_FATAL_PHASE1_ERROR,
}
} else {
match eh_action {
EHAction::None => return uw::_URC_CONTINUE_UNWIND,
EHAction::None => uw::_URC_CONTINUE_UNWIND,
EHAction::Cleanup(lpad) |
EHAction::Catch(lpad) => {
uw::_Unwind_SetGR(context, UNWIND_DATA_REG.0, exception_object as uintptr_t);
uw::_Unwind_SetGR(context, UNWIND_DATA_REG.1, 0);
uw::_Unwind_SetIP(context, lpad);
return uw::_URC_INSTALL_CONTEXT;
uw::_URC_INSTALL_CONTEXT
}
EHAction::Terminate => return uw::_URC_FATAL_PHASE2_ERROR,
EHAction::Terminate => uw::_URC_FATAL_PHASE2_ERROR,
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/libpanic_unwind/seh64_gnu.rs
Expand Up @@ -46,7 +46,7 @@ pub fn payload() -> *mut u8 {

pub unsafe fn cleanup(ptr: *mut u8) -> Box<dyn Any + Send> {
let panic_ctx = Box::from_raw(ptr as *mut PanicData);
return panic_ctx.data;
panic_ctx.data
}

// SEH doesn't support resuming unwinds after calling a landing pad like
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/panicking.rs
Expand Up @@ -217,7 +217,7 @@ pub fn update_panic_count(amt: isize) -> usize {
PANIC_COUNT.with(|c| {
let next = (c.get() as isize + amt) as usize;
c.set(next);
return next
next
})
}

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/unix/rand.rs
Expand Up @@ -8,7 +8,7 @@ pub fn hashmap_random_keys() -> (u64, u64) {
mem::size_of_val(&v));
imp::fill_bytes(view);
}
return v
v
}

#[cfg(all(unix,
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/handle.rs
Expand Up @@ -46,7 +46,7 @@ impl Handle {
pub fn into_raw(self) -> c::HANDLE {
let ret = self.raw();
mem::forget(self);
return ret;
ret
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/mutex.rs
Expand Up @@ -144,7 +144,7 @@ fn kind() -> Kind {
Some(..) => Kind::SRWLock,
};
KIND.store(ret as usize, Ordering::SeqCst);
return ret;
ret
}

pub struct ReentrantMutex { inner: UnsafeCell<MaybeUninit<c::CRITICAL_SECTION>> }
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/process.rs
Expand Up @@ -257,7 +257,7 @@ impl Stdio {
let ret = io.duplicate(0, true,
c::DUPLICATE_SAME_ACCESS);
io.into_raw();
return ret
ret
}
Err(..) => Ok(Handle::new(c::INVALID_HANDLE_VALUE)),
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/rand.rs
Expand Up @@ -13,7 +13,7 @@ pub fn hashmap_random_keys() -> (u64, u64) {
panic!("couldn't generate random bytes: {}",
io::Error::last_os_error());
}
return v
v
}

#[cfg(target_vendor = "uwp")]
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/windows/thread_local.rs
Expand Up @@ -52,7 +52,7 @@ pub unsafe fn create(dtor: Option<Dtor>) -> Key {
if let Some(f) = dtor {
register_dtor(key, f);
}
return key;
key
}

#[inline]
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/sys/windows/time.rs
Expand Up @@ -80,7 +80,7 @@ impl SystemTime {
unsafe {
let mut t: SystemTime = mem::zeroed();
c::GetSystemTimeAsFileTime(&mut t.t);
return t
t
}
}

Expand Down Expand Up @@ -228,7 +228,7 @@ mod perf_counter {
FREQUENCY = frequency;
STATE.store(2, SeqCst);
}
return frequency;
frequency
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/libtest/bench.rs
Expand Up @@ -48,7 +48,7 @@ impl Bencher {
F: FnMut(&mut Bencher),
{
f(self);
return self.summary;
self.summary
}
}

Expand Down Expand Up @@ -116,7 +116,7 @@ where
for _ in 0..k {
black_box(inner());
}
return ns_from_dur(start.elapsed());
ns_from_dur(start.elapsed())
}

pub fn iter<T, F>(inner: &mut F) -> stats::Summary
Expand Down
2 changes: 1 addition & 1 deletion src/libtest/cli.rs
Expand Up @@ -149,7 +149,7 @@ fn optgroups() -> getopts::Options {
`CRITICAL_TIME` here means the limit that should not be exceeded by test.
"
);
return opts;
opts
}

fn usage(binary: &str, options: &getopts::Options) {
Expand Down
2 changes: 1 addition & 1 deletion src/libtest/console.rs
Expand Up @@ -296,7 +296,7 @@ pub fn run_tests_console(opts: &TestOpts, tests: Vec<TestDescAndFn>) -> io::Resu

assert!(st.current_test_count() == st.total);

return out.write_run_finish(&st);
out.write_run_finish(&st)
}

// Calculates padding for given test description.
Expand Down

0 comments on commit 95c06a2

Please sign in to comment.