Skip to content

Commit 32d0bc1

Browse files
jrvidalMendelMonteiro
authored andcommitted
fix: revert primitive_types4 (rust-lang#296)
1 parent 7b0fb0d commit 32d0bc1

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

exercises/primitive_types/primitive_types4.rs

+2
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ fn slice_out_of_array() {
77
let a = [1, 2, 3, 4, 5];
88

99
let nice_slice = &a[1..4];
10+
11+
assert_eq!([2, 3, 4], nice_slice)
1012
}

exercises/primitive_types/primitive_types4.rs.orig

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ fn slice_out_of_array() {
88

99
<<<<<<< HEAD
1010
let nice_slice = &a[1..4];
11+
=======
12+
let nice_slice = ???
1113

1214
assert_eq!([2, 3, 4], nice_slice)
13-
=======
14-
>>>>>>> feature: makes "compile" exercise print output, resolves #270
15+
>>>>>>> fix: revert primitive_types4 (#296)
1516
}

0 commit comments

Comments
 (0)