Skip to content

Commit 8ae1bb4

Browse files
authored
Merge pull request scala#148 from ashawley/2.12-lint-warnings
Fix 2.12 warnings
2 parents b7f38c6 + 3af7a49 commit 8ae1bb4

File tree

5 files changed

+1
-5
lines changed

5 files changed

+1
-5
lines changed

jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package scala.xml
22

33
import org.junit.Test
4-
import org.junit.Ignore
54
import org.junit.Assert.assertEquals
65

76
class XMLSyntaxTestJVM {

jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package scala.xml.parsing
22

33
import org.junit.Test
4-
import org.junit.Ignore
54
import scala.xml.JUnitAssertsForXML.assertEquals
65

76
class Ticket0632TestJVM {

shared/src/test/scala/scala/xml/PatternMatching.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class PatternMatching extends {
8080
})
8181

8282
// SI-1059
83-
var m: PartialFunction[Any, Any] = { case SafeNodeSeq(s @ _*) => s }
83+
val m: PartialFunction[Any, Any] = { case SafeNodeSeq(s @ _*) => s }
8484

8585
assertEquals(m(<a/> ++ <b/>), List(<a/>, <b/>))
8686
assertTrue(m.isDefinedAt(<a/> ++ <b/>))

shared/src/test/scala/scala/xml/Transformers.scala

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package scala.xml
33
import scala.xml.transform._
44

55
import org.junit.Test
6-
import org.junit.Assert.assertTrue
76
import org.junit.Assert.assertEquals
87

98
class Transformers {

shared/src/test/scala/scala/xml/XMLTest.scala

-1
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ class XMLTest {
261261

262262
@UnitTest
263263
def XmlEy {
264-
val z = ax \ "@{the namespace from outer space}foo"
265264
assertTrue((ax \ "@{the namespace from outer space}foo") xml_== "baz")
266265
assertTrue((cx \ "@{the namespace from outer space}foo") xml_== "baz")
267266

0 commit comments

Comments
 (0)