Remove explicit returns where unnecessary

diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index 39ec5d6411c16c26b3161414426cc6722f18e809..35e4eea756d41ca0cceef932b15751a3928f1331 100644 (file)
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -217,7 +217,7 @@ pub fn padding_needed_for(&self, align: usize) -> usize {
 
         let len_rounded_up = len.wrapping_add(align).wrapping_sub(1)
             & !align.wrapping_sub(1);
-        return len_rounded_up.wrapping_sub(len);
+        len_rounded_up.wrapping_sub(len)
     }
 
     /// Creates a layout describing the record for `n` instances of
@@ -971,9 +971,9 @@ unsafe fn grow_in_place(&mut self,
         // _l <= layout.size()                       [guaranteed by usable_size()]
         //       layout.size() <= new_layout.size()  [required by this method]
         if new_size <= u {
-            return Ok(());
+            Ok(())
         } else {
-            return Err(CannotReallocInPlace);
+            Err(CannotReallocInPlace)
         }
     }
 
@@ -1026,9 +1026,9 @@ unsafe fn shrink_in_place(&mut self,
         //                      layout.size() <= _u  [guaranteed by usable_size()]
         // new_layout.size() <= layout.size()        [required by this method]
         if l <= new_size {
-            return Ok(());
+            Ok(())
         } else {
-            return Err(CannotReallocInPlace);
+            Err(CannotReallocInPlace)
         }
     }
 

diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs
index 5be673db3200d8b3696749443520c48bafeb964b..7e1313747eef205f2d92d6e54645b8914159216a 100644 (file)
--- a/src/libcore/char/mod.rs
+++ b/src/libcore/char/mod.rs
@@ -312,8 +312,8 @@ fn nth(&mut self, n: usize) -> Option<char> {
                     None
                 }
             },
-            EscapeDefaultState::Done => return None,
-            EscapeDefaultState::Unicode(ref mut i) => return i.nth(n),
+            EscapeDefaultState::Done => None,
+            EscapeDefaultState::Unicode(ref mut i) => i.nth(n),
         }
     }
 

diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs
index 479c10c4ffbae40ecd0a169687381da1fb5e28dd..99d93d5687a1cf5c9ca4cca1e2c7ff0b31e95baf 100644 (file)
--- a/src/libcore/ptr.rs
+++ b/src/libcore/ptr.rs
@@ -2288,7 +2288,7 @@ fn mod_inv(x: usize, m: usize) -> usize {
 
         let table_inverse = INV_TABLE_MOD_16[(x & (INV_TABLE_MOD - 1)) >> 1];
         if m <= INV_TABLE_MOD {
-            return table_inverse & (m - 1);
+            table_inverse & (m - 1)
         } else {
             // We iterate "up" using the following formula:
             //
@@ -2375,7 +2375,7 @@ fn mod_inv(x: usize, m: usize) -> usize {
     }
 
     // Cannot be aligned at all.
-    return usize::max_value();
+    usize::max_value()
 }
 
 

diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs
index a4dde38cb7bb636abb201cbd26c056a0b4cd21f5..490a11ac598bc83d8d3583d21ee219092b14b049 100644 (file)
--- a/src/libcore/slice/mod.rs
+++ b/src/libcore/slice/mod.rs
@@ -1727,7 +1727,7 @@ fn gcd(a: usize, b: usize) -> usize {
                     ctz_b = ::intrinsics::cttz_nonzero(b);
                 }
             }
-            return a << k;
+            a << k
         }
         let gcd: usize = gcd(::mem::size_of::<T>(), ::mem::size_of::<U>());
         let ts: usize = ::mem::size_of::<U>() / gcd;
@@ -1737,7 +1737,7 @@ fn gcd(a: usize, b: usize) -> usize {
         let us_len = self.len() / ts * us;
         // And how many `T`s will be in the trailing slice!
         let ts_len = self.len() % ts;
-        return (us_len, ts_len);
+        (us_len, ts_len)
     }
 
     /// Transmute the slice to a slice of another type, ensuring aligment of the types is
@@ -1782,13 +1782,13 @@ pub unsafe fn align_to<U>(&self) -> (&[T], &[U], &[T]) {
         let ptr = self.as_ptr();
         let offset = ::ptr::align_offset(ptr, ::mem::align_of::<U>());
         if offset > self.len() {
-            return (self, &[], &[]);
+            (self, &[], &[])
         } else {
             let (left, rest) = self.split_at(offset);
             let (us_len, ts_len) = rest.align_to_offsets::<U>();
-            return (left,
-                    from_raw_parts(rest.as_ptr() as *const U, us_len),
-                    from_raw_parts(rest.as_ptr().offset((rest.len() - ts_len) as isize), ts_len))
+            (left,
+             from_raw_parts(rest.as_ptr() as *const U, us_len),
+             from_raw_parts(rest.as_ptr().offset((rest.len() - ts_len) as isize), ts_len))
         }
     }
 
@@ -1834,14 +1834,14 @@ pub unsafe fn align_to_mut<U>(&mut self) -> (&mut [T], &mut [U], &mut [T]) {
         let ptr = self.as_ptr();
         let offset = ::ptr::align_offset(ptr, ::mem::align_of::<U>());
         if offset > self.len() {
-            return (self, &mut [], &mut []);
+            (self, &mut [], &mut [])
         } else {
             let (left, rest) = self.split_at_mut(offset);
             let (us_len, ts_len) = rest.align_to_offsets::<U>();
             let mut_ptr = rest.as_mut_ptr();
-            return (left,
-                    from_raw_parts_mut(mut_ptr as *mut U, us_len),
-                    from_raw_parts_mut(mut_ptr.offset((rest.len() - ts_len) as isize), ts_len))
+            (left,
+             from_raw_parts_mut(mut_ptr as *mut U, us_len),
+             from_raw_parts_mut(mut_ptr.offset((rest.len() - ts_len) as isize), ts_len))
         }
     }
 }

diff --git a/src/libcore/str/lossy.rs b/src/libcore/str/lossy.rs
index 5cfb36d3b195bbcc2673673b2c2155cd74f8975f..186d6adbc91cf67ecb6c88df1acf286c943cebf4 100644 (file)
--- a/src/libcore/str/lossy.rs
+++ b/src/libcore/str/lossy.rs
@@ -146,7 +146,7 @@ macro_rules! error { () => ({
             broken: &[],
         };
         self.source = &[];
-        return Some(r);
+        Some(r)
     }
 }
 

diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 86b8349fa3c89cd1894f39d8172b4d02e9465873..b541e627ee3d775420c46000ededb410c7cc3bee 100644 (file)
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -1567,7 +1567,7 @@ macro_rules! next { () => {{
 #[unstable(feature = "str_internals", issue = "0")]
 #[inline]
 pub fn utf8_char_width(b: u8) -> usize {
-    return UTF8_CHAR_WIDTH[b as usize] as usize;
+    UTF8_CHAR_WIDTH[b as usize] as usize
 }
 
 /// Mask of the value bits of a continuation byte.

diff --git a/src/tools/remote-test-server/src/main.rs b/src/tools/remote-test-server/src/main.rs
index 5116f6662ff4dc416b15294b88d2bb9ffa39a114..9501adb938616de359b3e44ce9c41f7b4d8d5860 100644 (file)
--- a/src/tools/remote-test-server/src/main.rs
+++ b/src/tools/remote-test-server/src/main.rs
@@ -267,7 +267,7 @@ fn recv<B: BufRead>(dir: &Path, io: &mut B) -> PathBuf {
     t!(io::copy(&mut io.take(amt),
                 &mut t!(File::create(&dst))));
     t!(fs::set_permissions(&dst, Permissions::from_mode(0o755)));
-    return dst
+    dst
 }
 
 fn my_copy(src: &mut dyn Read, which: u8, dst: &Mutex<dyn Write>) {