about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorP1start <rewi-github@whanau.org>2014-12-23 13:13:49 +1300
committerP1start <rewi-github@whanau.org>2014-12-25 18:58:47 +1300
commitd9769ec3834b62318da892925dc24c8883bb1635 (patch)
tree0455c075f4c1d37151c726fbbf6621e55448c525 /src/libstd
parent7e11b22713aebd28ceaaa2ecef937c9b9d247c2f (diff)
downloadrust-d9769ec3834b62318da892925dc24c8883bb1635.tar.gz
rust-d9769ec3834b62318da892925dc24c8883bb1635.zip
Parse fully-qualified associated types in generics without whitespace
This breaks code that looks like this:

    let x = foo as bar << 13;

Change such code to look like this:

    let x = (foo as bar) << 13;

Closes #17362.

[breaking-change]
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/net/ip.rs4
-rw-r--r--src/libstd/sys/common/net.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs
index add986387da..83be9574f78 100644
--- a/src/libstd/io/net/ip.rs
+++ b/src/libstd/io/net/ip.rs
@@ -267,8 +267,8 @@ impl<'a> Parser<'a> {
                     });
                     match ipv4 {
                         Some(Ipv4Addr(a, b, c, d)) => {
-                            groups[i + 0] = (a as u16 << 8) | (b as u16);
-                            groups[i + 1] = (c as u16 << 8) | (d as u16);
+                            groups[i + 0] = ((a as u16) << 8) | (b as u16);
+                            groups[i + 1] = ((c as u16) << 8) | (d as u16);
                             return (i + 2, true);
                         }
                         _ => {}
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs
index 382f6875b28..1e8246dabc5 100644
--- a/src/libstd/sys/common/net.rs
+++ b/src/libstd/sys/common/net.rs
@@ -55,10 +55,10 @@ pub enum InAddr {
 pub fn ip_to_inaddr(ip: IpAddr) -> InAddr {
     match ip {
         Ipv4Addr(a, b, c, d) => {
-            let ip = (a as u32 << 24) |
-                     (b as u32 << 16) |
-                     (c as u32 <<  8) |
-                     (d as u32 <<  0);
+            let ip = ((a as u32) << 24) |
+                     ((b as u32) << 16) |
+                     ((c as u32) <<  8) |
+                     ((d as u32) <<  0);
             In4Addr(libc::in_addr {
                 s_addr: Int::from_be(ip)
             })