Skip to content

Commit 353f80b

Browse files
committed
Fix more rebase breakage
1 parent da14277 commit 353f80b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/neg-custom-args/captures/lazylist.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
-- [E007] Type Mismatch Error: tests/neg-custom-args/captures/lazylist.scala:41:42 -------------------------------------
3030
41 | val ref4c: LazyList[Int]^{cap1, ref3} = ref4 // error
3131
| ^^^^
32-
| Found: (ref4 : lazylists.LazyList[Int]^{cap3, cap2, ref1, cap1})
32+
| Found: (ref4 : lazylists.LazyList[Int]^{cap3, ref1, ref2})
3333
| Required: lazylists.LazyList[Int]^{cap1, ref3}
3434
|
3535
| longer explanation available when compiling with `-explain`

tests/neg-custom-args/captures/real-try.check

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
-- [E190] Potential Issue Warning: tests/neg-custom-args/captures/real-try.scala:38:4 ----------------------------------
2-
38 | b.x
3-
| ^^^
4-
| Discarded non-Unit value of type () -> Unit. Add `: Unit` to discard silently.
1+
-- [E190] Potential Issue Warning: tests/neg-custom-args/captures/real-try.scala:38:2 ----------------------------------
2+
38 | b
3+
| ^
4+
| Discarded non-Unit value of type Cell[() -> Unit]. Add `: Unit` to discard silently.
55
|
66
| longer explanation available when compiling with `-explain`
77
-- Error: tests/neg-custom-args/captures/real-try.scala:14:2 -----------------------------------------------------------

0 commit comments

Comments
 (0)