Merge branch 'master' into try_buffered

rust-lang · Oct 31, 2020 · aa1dde3 · aa1dde3
2 parents 76042bc + e363f18
commit aa1dde3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/futures/tests/join_all.rs b/futures/tests/join_all.rs
@@ -37,7 +37,7 @@ fn join_all_iter_lifetime() {
         Box::new(join_all(iter))
     }
 
-    util::assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), vec![3 as usize, 0, 1]);
+    util::assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), vec![3_usize, 0, 1]);
 }
 
 #[test]

diff --git a/futures/tests/try_join_all.rs b/futures/tests/try_join_all.rs
@@ -42,7 +42,7 @@ fn try_join_all_iter_lifetime() {
         Box::new(try_join_all(iter))
     }
 
-    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), Ok(vec![3 as usize, 0, 1]));
+    assert_done(|| sizes(vec![&[1,2,3], &[], &[0]]), Ok(vec![3_usize, 0, 1]));
 }
 
 #[test]