From 3af7a49845995fcca1f48d0bc8e0ae3b018e7c1c Mon Sep 17 00:00:00 2001
From: "Aaron S. Hawley" <aaron.s.hawley@gmail.com>
Date: Fri, 5 May 2017 12:39:47 -0400
Subject: [PATCH] Fix 2.12 warnings

- Unused imports
- Unused code (in tests)
- Local var never set (convert to val)

[warn] scala-xml/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala:4: Unused import
[warn] import org.junit.Ignore
[warn]
[warn] jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala:4: Unused import
[warn] import org.junit.Ignore
[warn]                  ^
[warn] shared/src/test/scala/scala/xml/PatternMatching.scala:83: local var m in method nodeSeq is never set: consider using immutable val
[warn]     var m: PartialFunction[Any, Any] = { case SafeNodeSeq(s @ _*) => s }
[warn]         ^
[warn] shared/src/test/scala/scala/xml/Transformers.scala:6: Unused import
[warn] import org.junit.Assert.assertTrue
[warn]                         ^
[warn] shared/src/test/scala/scala/xml/XMLTest.scala:264: local val z in method XmlEy is never used
[warn]     val z = ax \ "@{the namespace from outer space}foo"
[warn]                ^
[warn] three warnings found
[warn] 3 warnings found
---
 jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala          | 1 -
 jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala | 1 -
 shared/src/test/scala/scala/xml/PatternMatching.scala     | 2 +-
 shared/src/test/scala/scala/xml/Transformers.scala        | 1 -
 shared/src/test/scala/scala/xml/XMLTest.scala             | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala b/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
index 48c5e1d22..50dbf4a65 100644
--- a/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
@@ -1,7 +1,6 @@
 package scala.xml
 
 import org.junit.Test
-import org.junit.Ignore
 import org.junit.Assert.assertEquals
 
 class XMLSyntaxTestJVM {
diff --git a/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala b/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
index 40b1976ab..ceb27c994 100644
--- a/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
+++ b/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
@@ -1,7 +1,6 @@
 package scala.xml.parsing
 
 import org.junit.Test
-import org.junit.Ignore
 import scala.xml.JUnitAssertsForXML.assertEquals
 
 class Ticket0632TestJVM {
diff --git a/shared/src/test/scala/scala/xml/PatternMatching.scala b/shared/src/test/scala/scala/xml/PatternMatching.scala
index 14f45b10a..fbf94b62b 100644
--- a/shared/src/test/scala/scala/xml/PatternMatching.scala
+++ b/shared/src/test/scala/scala/xml/PatternMatching.scala
@@ -80,7 +80,7 @@ class PatternMatching extends {
     })
 
     // SI-1059
-    var m: PartialFunction[Any, Any] = { case SafeNodeSeq(s @ _*) => s }
+    val m: PartialFunction[Any, Any] = { case SafeNodeSeq(s @ _*) => s }
 
     assertEquals(m(<a/> ++ <b/>), List(<a/>, <b/>))
     assertTrue(m.isDefinedAt(<a/> ++ <b/>))
diff --git a/shared/src/test/scala/scala/xml/Transformers.scala b/shared/src/test/scala/scala/xml/Transformers.scala
index e02d0d6a6..5cec41080 100644
--- a/shared/src/test/scala/scala/xml/Transformers.scala
+++ b/shared/src/test/scala/scala/xml/Transformers.scala
@@ -3,7 +3,6 @@ package scala.xml
 import scala.xml.transform._
 
 import org.junit.Test
-import org.junit.Assert.assertTrue
 import org.junit.Assert.assertEquals
 
 class Transformers {
diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index ac2f4347f..46f21d16f 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLTest.scala
@@ -261,7 +261,6 @@ class XMLTest {
 
   @UnitTest
   def XmlEy {
-    val z = ax \ "@{the namespace from outer space}foo"
     assertTrue((ax \ "@{the namespace from outer space}foo") xml_== "baz")
     assertTrue((cx \ "@{the namespace from outer space}foo") xml_== "baz")