about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2014-01-19 19:21:14 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2014-01-21 22:00:18 +1100
commit39713b829535b40aff2b7f368839d07ea7c2bf11 (patch)
tree897cd7f2eb52770a2dd4d4c69efc47e1ecc7b4f7 /src/libstd
parent39012288118146331add60f2b1c90b07b6a6c51b (diff)
downloadrust-39713b829535b40aff2b7f368839d07ea7c2bf11.tar.gz
rust-39713b829535b40aff2b7f368839d07ea7c2bf11.zip
Remove unnecessary parentheses.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/hash.rs2
-rw-r--r--src/libstd/io/extensions.rs2
-rw-r--r--src/libstd/option.rs4
-rw-r--r--src/libstd/os.rs10
-rw-r--r--src/libstd/ptr.rs4
-rw-r--r--src/libstd/str.rs6
-rw-r--r--src/libstd/sync/mpmc_bounded_queue.rs2
-rw-r--r--src/libstd/task.rs2
-rw-r--r--src/libstd/trie.rs2
9 files changed, 17 insertions, 17 deletions
diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs
index d1b1273d5e0..1444f9b4129 100644
--- a/src/libstd/hash.rs
+++ b/src/libstd/hash.rs
@@ -263,7 +263,7 @@ impl Streaming for SipState {
         compress!(v0, v1, v2, v3);
         compress!(v0, v1, v2, v3);
 
-        return (v0 ^ v1 ^ v2 ^ v3);
+        return v0 ^ v1 ^ v2 ^ v3;
     }
 
     fn result_bytes(&mut self) -> ~[u8] {
diff --git a/src/libstd/io/extensions.rs b/src/libstd/io/extensions.rs
index 511462f89f8..e58fcc16182 100644
--- a/src/libstd/io/extensions.rs
+++ b/src/libstd/io/extensions.rs
@@ -518,7 +518,7 @@ mod bench {
             let mut sum = 0u64;
             bh.iter(|| {
                 let mut i = $start_index;
-                while (i < data.len()) {
+                while i < data.len() {
                     sum += u64_from_be_bytes(data, i, $size);
                     i += $stride;
                 }
diff --git a/src/libstd/option.rs b/src/libstd/option.rs
index 621b1a3d1e2..53fa41f9cfd 100644
--- a/src/libstd/option.rs
+++ b/src/libstd/option.rs
@@ -292,7 +292,7 @@ impl<T> Option<T> {
     #[inline(always)]
     pub fn filtered(self, f: |t: &T| -> bool) -> Option<T> {
         match self {
-            Some(x) => if(f(&x)) {Some(x)} else {None},
+            Some(x) => if f(&x) {Some(x)} else {None},
             None => None
         }
     }
@@ -605,7 +605,7 @@ mod tests {
         let mut i = 0;
         Some(10).while_some(|j| {
             i += 1;
-            if (j > 0) {
+            if j > 0 {
                 Some(j-1)
             } else {
                 None
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 4042e13a592..36ce3e93127 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -103,9 +103,9 @@ pub mod win32 {
                 let k = f(buf.as_mut_ptr(), TMPBUF_SZ as DWORD);
                 if k == (0 as DWORD) {
                     done = true;
-                } else if (k == n &&
-                           libc::GetLastError() ==
-                           libc::ERROR_INSUFFICIENT_BUFFER as DWORD) {
+                } else if k == n &&
+                          libc::GetLastError() ==
+                          libc::ERROR_INSUFFICIENT_BUFFER as DWORD {
                     n *= (2 as DWORD);
                 } else {
                     done = true;
@@ -159,7 +159,7 @@ pub fn env() -> ~[(~str,~str)] {
                 FreeEnvironmentStringsA
             };
             let ch = GetEnvironmentStringsA();
-            if (ch as uint == 0) {
+            if ch as uint == 0 {
                 fail!("os::env() failure getting env string from OS: {}",
                        os::last_os_error());
             }
@@ -176,7 +176,7 @@ pub fn env() -> ~[(~str,~str)] {
                 fn rust_env_pairs() -> **libc::c_char;
             }
             let environ = rust_env_pairs();
-            if (environ as uint == 0) {
+            if environ as uint == 0 {
                 fail!("os::env() failure getting env string from OS: {}",
                        os::last_os_error());
             }
diff --git a/src/libstd/ptr.rs b/src/libstd/ptr.rs
index 9cf36adc36f..dcb6d2719d9 100644
--- a/src/libstd/ptr.rs
+++ b/src/libstd/ptr.rs
@@ -201,7 +201,7 @@ pub fn to_mut_unsafe_ptr<T>(thing: &mut T) -> *mut T {
 */
 pub unsafe fn array_each_with_len<T>(arr: **T, len: uint, cb: |*T|) {
     debug!("array_each_with_len: before iterate");
-    if (arr as uint == 0) {
+    if arr as uint == 0 {
         fail!("ptr::array_each_with_len failure: arr input is null pointer");
     }
     //let start_ptr = *arr;
@@ -222,7 +222,7 @@ pub unsafe fn array_each_with_len<T>(arr: **T, len: uint, cb: |*T|) {
   Dragons be here.
 */
 pub unsafe fn array_each<T>(arr: **T, cb: |*T|) {
-    if (arr as uint == 0) {
+    if arr as uint == 0 {
         fail!("ptr::array_each_with_len failure: arr input is null pointer");
     }
     let len = buf_len(arr);
diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index fdc9c11d93a..7398960eeb7 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -861,7 +861,7 @@ pub fn is_utf8(v: &[u8]) -> bool {
 pub fn is_utf16(v: &[u16]) -> bool {
     let len = v.len();
     let mut i = 0u;
-    while (i < len) {
+    while i < len {
         let u = v[i];
 
         if  u <= 0xD7FF_u16 || u >= 0xE000_u16 {
@@ -887,7 +887,7 @@ pub fn is_utf16(v: &[u16]) -> bool {
 pub fn utf16_chars(v: &[u16], f: |char|) {
     let len = v.len();
     let mut i = 0u;
-    while (i < len && v[i] != 0u16) {
+    while i < len && v[i] != 0u16 {
         let u = v[i];
 
         if  u <= 0xD7FF_u16 || u >= 0xE000_u16 {
@@ -2326,7 +2326,7 @@ impl<'a> StrSlice<'a> for &'a str {
 
     #[inline]
     fn char_range_at(&self, i: uint) -> CharRange {
-        if (self[i] < 128u8) {
+        if self[i] < 128u8 {
             return CharRange {ch: self[i] as char, next: i + 1 };
         }
 
diff --git a/src/libstd/sync/mpmc_bounded_queue.rs b/src/libstd/sync/mpmc_bounded_queue.rs
index bf02bf204a5..18be85152d7 100644
--- a/src/libstd/sync/mpmc_bounded_queue.rs
+++ b/src/libstd/sync/mpmc_bounded_queue.rs
@@ -101,7 +101,7 @@ impl<T: Send> State<T> {
                 } else {
                     pos = enqueue_pos;
                 }
-            } else if (diff < 0) {
+            } else if diff < 0 {
                 return false
             } else {
                 pos = self.enqueue_pos.load(Relaxed);
diff --git a/src/libstd/task.rs b/src/libstd/task.rs
index 900b6d49cc6..8ed4b70c0a2 100644
--- a/src/libstd/task.rs
+++ b/src/libstd/task.rs
@@ -481,7 +481,7 @@ fn test_spawn_sched() {
     fn f(i: int, ch: SharedChan<()>) {
         let ch = ch.clone();
         do spawn {
-            if (i == 0) {
+            if i == 0 {
                 ch.send(());
             } else {
                 f(i - 1, ch);
diff --git a/src/libstd/trie.rs b/src/libstd/trie.rs
index 2c3fd18e587..ead9cec9943 100644
--- a/src/libstd/trie.rs
+++ b/src/libstd/trie.rs
@@ -839,7 +839,7 @@ mod test_map {
             let mut ub = map.upper_bound(i);
             let next_key = i - i % step + step;
             let next_pair = (next_key, &value);
-            if (i % step == 0) {
+            if i % step == 0 {
                 assert_eq!(lb.next(), Some((i, &value)));
             } else {
                 assert_eq!(lb.next(), Some(next_pair));