Merge pull request rust-lang#21 from bluss/32-bit

Fix 32-bit compile
erickt · Mar 1, 2017 · 95a4b4b · 95a4b4b
2 parents 63a4509 + 8a95543
commit 95a4b4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,9 @@ matrix:
     - rust: stable
     - rust: beta
     - rust: nightly
+    - rust: nightly
+      env:
+       - FEATURES='test_low_transition_point'
 branches:
   only:
     - master

diff --git a/src/lib.rs b/src/lib.rs
@@ -141,7 +141,7 @@ impl Pos {
             }
         } else {
             Pos {
-                index: (i | (lo32(hash.0 as u64) << 32)) as u64
+                index: i as u64 | ((hash.0 as u64) << 32)
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -141,7 +141,7 @@ impl Pos { @@
                 }
             } else {
                 Pos {
-                    index: (i | (lo32(hash.0 as u64) << 32)) as u64
+                    index: i as u64 | ((hash.0 as u64) << 32)
                 }
             }
         }
@@ Expand Down @@