about summary refs log tree commit diff
path: root/src/comp/middle
diff options
context:
space:
mode:
authorMarijn Haverbeke <marijnh@gmail.com>2012-02-09 11:50:54 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-02-09 11:58:08 +0100
commit50fb4c30ed02e72a715e093c8f87b0c179fb3ccb (patch)
treef94ca4759ed236f088971717c3d1cc4182002ac2 /src/comp/middle
parent1dc5e1aa94d1c82d12385dfcb95c75cbaaa318a9 (diff)
downloadrust-50fb4c30ed02e72a715e093c8f87b0c179fb3ccb.tar.gz
rust-50fb4c30ed02e72a715e093c8f87b0c179fb3ccb.zip
Increase precedence of as operator
Closes #1717
Diffstat (limited to 'src/comp/middle')
-rw-r--r--src/comp/middle/shape.rs2
-rw-r--r--src/comp/middle/trans/base.rs5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/comp/middle/shape.rs b/src/comp/middle/shape.rs
index 587c5c29ca3..089aa8eeedb 100644
--- a/src/comp/middle/shape.rs
+++ b/src/comp/middle/shape.rs
@@ -308,7 +308,7 @@ fn mk_ctxt(llmod: ModuleRef) -> ctxt {
 fn add_bool(&dest: [u8], val: bool) { dest += [if val { 1u8 } else { 0u8 }]; }
 
 fn add_u16(&dest: [u8], val: u16) {
-    dest += [val & 0xffu16 as u8, val >> 8u16 as u8];
+    dest += [(val & 0xffu16) as u8, (val >> 8u16) as u8];
 }
 
 fn add_substr(&dest: [u8], src: [u8]) {
diff --git a/src/comp/middle/trans/base.rs b/src/comp/middle/trans/base.rs
index f8accd50714..596671be9e7 100644
--- a/src/comp/middle/trans/base.rs
+++ b/src/comp/middle/trans/base.rs
@@ -231,9 +231,8 @@ fn sanitize(s: str) -> str {
 
 fn log_fn_time(ccx: @crate_ctxt, name: str, start: time::timeval,
                end: time::timeval) {
-    let elapsed =
-        1000 * (end.sec - start.sec as int) +
-            ((end.usec as int) - (start.usec as int)) / 1000;
+    let elapsed = 1000 * ((end.sec - start.sec) as int) +
+        ((end.usec as int) - (start.usec as int)) / 1000;
     *ccx.stats.fn_times += [{ident: name, time: elapsed}];
 }