diff options
| author | bors <bors@rust-lang.org> | 2015-01-03 03:25:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-03 03:25:21 +0000 |
| commit | 9c3e6082e71618c088afd93f7a4a9a7708c9dcbd (patch) | |
| tree | 7f0a4f049f87f845a99751add69cda3409a91c20 /src/libstd/sys | |
| parent | a6b109723aa78154ffcfa4db80f3f36b76a9c0a7 (diff) | |
| parent | d9769ec3834b62318da892925dc24c8883bb1635 (diff) | |
| download | rust-9c3e6082e71618c088afd93f7a4a9a7708c9dcbd.tar.gz rust-9c3e6082e71618c088afd93f7a4a9a7708c9dcbd.zip | |
auto merge of #20154 : P1start/rust/qualified-assoc-type-generics, r=nikomatsakis
This modifies `Parser::eat_lt` to always split up `<<`s, instead of doing so only when a lifetime name followed or the `force` parameter (now removed) was `true`. This is because `Foo<<TYPE` is now a valid start to a type, whereas previously only `Foo<<LIFETIME` was valid. This is a [breaking-change]. Change code that looks like this: ```rust let x = foo as bar << 13; ``` to use parentheses, like this: ```rust let x = (foo as bar) << 13; ``` Closes #17362.
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/net.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index cb0c5581abd..94a2c9b78fa 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -56,10 +56,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) }) |
