Merge rayon-rs#589

589: Force lazy_static 1.0.2 for older CI r=cuviper a=cuviper

Fixes rayon-rs#587.

Co-authored-by: Josh Stone <[email protected]>

Author: bors[bot]

.travis.yml

@@ -16,6 +16,10 @@ matrix:
       os: linux
       #if: everything!
       script: cargo build
+      before_script:
+        # lazy_static 1.1 requires Rust 1.21+, so downgrade it.
+        - cargo generate-lockfile
+        - cargo update -p lazy_static --precise 1.0.2
 
     - rust: stable
       os: linux

src/range.rs

@@ -244,7 +244,7 @@ fn test_u64_opt_len() {
     assert_eq!(Some(100), (0..100u64).into_par_iter().opt_len());
     assert_eq!(Some(usize::MAX), (0..usize::MAX as u64).into_par_iter().opt_len());
     if (usize::MAX as u64) < u64::MAX {
-        assert_eq!(None, (0..1 + usize::MAX as u64).into_par_iter().opt_len());
+        assert_eq!(None, (0..(usize::MAX as u64).wrapping_add(1)).into_par_iter().opt_len());
         assert_eq!(None, (0..u64::MAX).into_par_iter().opt_len());
     }
 }