diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs index 4c8fd130cd..d773c13710 100644 --- a/exercises/primitive_types/primitive_types4.rs +++ b/exercises/primitive_types/primitive_types4.rs @@ -7,4 +7,6 @@ fn slice_out_of_array() { let a = [1, 2, 3, 4, 5]; let nice_slice = &a[1..4]; + + assert_eq!([2, 3, 4], nice_slice) } diff --git a/exercises/primitive_types/primitive_types4.rs.orig b/exercises/primitive_types/primitive_types4.rs.orig index 7ee1bba7ca..f11aba19bd 100644 --- a/exercises/primitive_types/primitive_types4.rs.orig +++ b/exercises/primitive_types/primitive_types4.rs.orig @@ -8,8 +8,9 @@ fn slice_out_of_array() { <<<<<<< HEAD let nice_slice = &a[1..4]; +======= + let nice_slice = ??? assert_eq!([2, 3, 4], nice_slice) -======= ->>>>>>> feature: makes "compile" exercise print output, resolves #270 +>>>>>>> fix: revert primitive_types4 (#296) }