Skip to content

Commit

Permalink
fix: revert primitive_types4 (rust-lang#296)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrvidal authored and MendelMonteiro committed Jun 28, 2020
1 parent 7b0fb0d commit 32d0bc1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 2 additions & 0 deletions exercises/primitive_types/primitive_types4.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
5 changes: 3 additions & 2 deletions exercises/primitive_types/primitive_types4.rs.orig
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

0 comments on commit 32d0bc1

Please sign in to comment.