Idiomatic scala - remove explicit return

This commit is contained in:
Ben Challenor 2015-05-03 15:43:09 +01:00
parent c601c6805f
commit 28fac634bc
2 changed files with 3 additions and 3 deletions

View file

@ -30,7 +30,7 @@ object TestUtil {
def data(str : String) : Array[Byte] = { def data(str : String) : Array[Byte] = {
try { try {
return str.getBytes("ISO_8859-1") str.getBytes("ISO_8859-1")
} catch { } catch {
case e: Exception => throw new Error("could not decode") case e: Exception => throw new Error("could not decode")
} }

View file

@ -29,7 +29,7 @@ class LayoutSuite extends FunSuite {
class BareStructReader extends StructReader.Factory[StructReader] { class BareStructReader extends StructReader.Factory[StructReader] {
def constructReader(segment: org.capnproto.SegmentReader, data: Int, pointers: Int, def constructReader(segment: org.capnproto.SegmentReader, data: Int, pointers: Int,
dataSize: Int, pointerCount: Short, nestingLimit:Int) : StructReader = { dataSize: Int, pointerCount: Short, nestingLimit:Int) : StructReader = {
return new StructReader(segment,data,pointers,dataSize,pointerCount,nestingLimit) new StructReader(segment,data,pointers,dataSize,pointerCount,nestingLimit)
} }
} }
@ -123,7 +123,7 @@ class LayoutSuite extends FunSuite {
def constructBuilder(segment: org.capnproto.SegmentBuilder, data: Int, pointers: Int, def constructBuilder(segment: org.capnproto.SegmentBuilder, data: Int, pointers: Int,
dataSize: Int, pointerCount: Short) : StructBuilder = { dataSize: Int, pointerCount: Short) : StructBuilder = {
return new StructBuilder(segment,data,pointers,dataSize,pointerCount) new StructBuilder(segment,data,pointers,dataSize,pointerCount)
} }
} }