about summary refs log tree commit diff
diff options
context:
space:
mode:
authorwizAmit <amitforfriends_dns@yahoo.com>2019-05-22 22:55:16 +0530
committerwizAmit <amitforfriends_dns@yahoo.com>2019-05-22 22:55:16 +0530
commitbcfd1f39e7dcb824594d68b5d74732dc6d23cae9 (patch)
tree62328b9d98d5dfdd9569656294a324faf1870aaa
parent9309447397ffcc2f427f850c1a7df8af2c682169 (diff)
parentfd15405f74750ba6720fb13dd35205a2b7095ad1 (diff)
downloadrust-bcfd1f39e7dcb824594d68b5d74732dc6d23cae9.tar.gz
rust-bcfd1f39e7dcb824594d68b5d74732dc6d23cae9.zip
fix merge conflicts
-rw-r--r--src/libcore/tests/slice.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libcore/tests/slice.rs b/src/libcore/tests/slice.rs
index a4cb0c42044..cf2602f3210 100644
--- a/src/libcore/tests/slice.rs
+++ b/src/libcore/tests/slice.rs
@@ -158,7 +158,6 @@ fn test_chunks_nth_back() {
     assert_eq!(c4.nth_back(1_000_000_000usize), None);
 }
 
-
 #[test]
 fn test_chunks_last() {
     let v: &[i32] = &[0, 1, 2, 3, 4, 5];