Skip to content

Commit 1e1d7f9

Browse files
committed
Tweak up per review
1 parent 0a71760 commit 1e1d7f9

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

library/src/scala/util/Using.scala

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,21 @@ import scala.util.control.{ControlThrowable, NonFatal}
4747
* val files = List("file1.txt", "file2.txt", "file3.txt", "file4.txt")
4848
* val lines: Try[Seq[String]] = Using.Manager { use =>
4949
* // acquire resources
50-
* def reader(filename: String) = use(new BufferedReader(new FileReader(filename)))
50+
* def mkreader(filename: String) = use(new BufferedReader(new FileReader(filename)))
5151
*
5252
* // use your resources here
5353
* def lines(reader: BufferedReader): Iterator[String] =
5454
* Iterator.continually(reader.readLine()).takeWhile(_ != null)
5555
*
56-
* files.map(reader).flatMap(lines)
56+
* files.map(mkreader).flatMap(lines)
5757
* }
5858
* }}}
5959
*
6060
* Composed or "wrapped" resources may be acquired in order of construction,
61-
* if "underlying" resources are not closed:
61+
* if "underlying" resources are not closed. Although redundant in this case,
62+
* here is the previous example with a wrapped call to `use`:
6263
* {{{
63-
* def reader(filename: String) = use(new BufferedReader(use(new FileReader(filename))))
64+
* def mkreader(filename: String) = use(new BufferedReader(use(new FileReader(filename))))
6465
* }}}
6566
*
6667
* Custom resources can be registered on construction by requiring an implicit `Manager`.
@@ -76,7 +77,7 @@ import scala.util.control.{ControlThrowable, NonFatal}
7677
* val xres = X(x)
7778
* override def close() = println(s"CLOSE $y")
7879
* // an error during construction releases previously acquired resources
79-
* assert(y != null, "y is null")
80+
* require(y != null, "y is null")
8081
* mgr.acquire(this)
8182
* }
8283
*
@@ -88,7 +89,7 @@ import scala.util.control.{ControlThrowable, NonFatal}
8889
* Using.Manager { implicit mgr =>
8990
* Y(null)("X")
9091
* }
91-
* } // Failure(java.lang.AssertionError: assertion failed: y is null)
92+
* } // Failure(java.lang.IllegalArgumentException: requirement failed: y is null)
9293
* }}}
9394
*
9495
* If you wish to avoid wrapping management and operations in a `Try`, you can use

0 commit comments

Comments
 (0)