Skip to content

Commit 75edeec

Browse files
samuelchassotsamuelchassot
authored
fix warnings (#219)
1 parent 29f2f89 commit 75edeec

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

‎src/it/scala/inox/TestSuite.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import utils._
1010

1111
trait TestSuite extends AnyFunSuite with Matchers with TimeLimits {
1212

13-
protected def configurations: Seq[Seq[OptionValue[_]]] = Seq(Seq.empty)
13+
protected def configurations: Seq[Seq[OptionValue[?]]] = Seq(Seq.empty)
1414

1515
protected def createContext(options: Options): Context = inox.TestContext(options)
1616

@@ -25,7 +25,7 @@ trait TestSuite extends AnyFunSuite with Matchers with TimeLimits {
2525
}
2626

2727
protected def test(name: String, tags: Tag*)(body: Context ?=> Unit): Unit =
28-
test(name, _ => Test, tags : _*)(body)
28+
test(name, _ => Test, tags*)(body)
2929

3030
sealed abstract class FilterStatus
3131
case object Test extends FilterStatus
@@ -77,11 +77,11 @@ trait TestSuite extends AnyFunSuite with Matchers with TimeLimits {
7777
}
7878

7979
protected def ignore(name: String, tags: Tag*)(body: Context ?=> Unit): Unit =
80-
test(name, _ => Ignore, tags : _*)(body)
80+
test(name, _ => Ignore, tags*)(body)
8181

8282
protected def ignore(name: String, filter: Context => FilterStatus, tags: Tag*)(body: Context ?=> Unit): Unit =
8383
test(name, ctx => filter(ctx) match {
8484
case Skip => Skip
8585
case _ => Ignore
86-
}, tags : _*)(body)
86+
}, tags*)(body)
8787
}

‎src/it/scala/inox/binary/DeserializationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class DeserializationSuite extends AnyFunSpec with ResourceUtils {
1414

1515
val ctx = TestContext.empty
1616

17-
val files = resourceFiles("regression/binary", filter = _ endsWith ".inoxser", recursive = false)
17+
val files = resourceFiles("regression/binary", filter = _ `endsWith` ".inoxser", recursive = false)
1818

1919
describe("Deserializing from binary files") {
2020
for (file <- files) {

‎src/it/scala/inox/solvers/unrolling/BagSuite.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class BagSuite extends SolvingTestSuite with DatastructureUtils {
2727
val bagID = FreshIdentifier("bag")
2828
val bag = mkFunDef(bagID)("A") { case Seq(aT) => (
2929
Seq("l" :: List(aT)), BagType(aT), { case Seq(l) =>
30-
if_ (l is consID) {
30+
if_ (l `is` consID) {
3131
BagAdd(E(bagID)(aT)(l.getField(tail)), l.getField(head))
3232
} else_ {
3333
FiniteBag(Seq.empty, aT)
@@ -40,7 +40,7 @@ class BagSuite extends SolvingTestSuite with DatastructureUtils {
4040
Seq("l" :: List(aT)), T(List(aT), List(aT)), { case Seq(l) =>
4141
let(
4242
"res" :: T(List(aT), List(aT)),
43-
if_ ((l is consID) && (l.getField(tail) is consID)) {
43+
if_ ((l `is` consID) && (l.getField(tail) `is` consID)) {
4444
let(
4545
"tuple" :: T(List(aT), List(aT)),
4646
E(splitID)(aT)(l.getField(tail).getField(tail))
@@ -60,7 +60,7 @@ class BagSuite extends SolvingTestSuite with DatastructureUtils {
6060
Seq("l" :: List(aT)), T(List(aT), List(aT)), { case Seq(l) =>
6161
let(
6262
"res" :: T(List(aT), List(aT)),
63-
if_ ((l is consID) && (l.getField(tail) is consID)) {
63+
if_ ((l `is` consID) && (l.getField(tail) `is` consID)) {
6464
let(
6565
"tuple" :: T(List(aT), List(aT)),
6666
E(splitID)(aT)(l.getField(tail).getField(tail))

‎src/it/scala/inox/solvers/unrolling/FunctionEqualitySuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FunctionEqualitySuite extends SolvingTestSuite with DatastructureUtils {
2020
val containsID = FreshIdentifier("contains")
2121
val contains = mkFunDef(containsID)("A", "B") { case Seq(aT, bT) => (
2222
Seq("m" :: T(mmapID)(aT, bT), "k" :: aT), BooleanType(), { case Seq(m, k) =>
23-
m.getField(f)(k) is someID
23+
m.getField(f)(k) `is` someID
2424
})
2525
}
2626

‎src/it/scala/inox/solvers/unrolling/InductiveUnrollingSuite.scala

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
2121

2222
val sizeFd = mkFunDef(sizeID)("A") { case Seq(aT) => (
2323
Seq("l" :: T(listID)(aT)), IntegerType(), { case Seq(l) =>
24-
if_ (l is consID) {
24+
if_ (l `is` consID) {
2525
E(BigInt(1)) + let("res" :: IntegerType(), E(sizeID)(aT)(l.getField(tail))) {
2626
res => Assume(res >= E(BigInt(0)), res)
2727
}
@@ -33,7 +33,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
3333

3434
val append = mkFunDef(appendID)("A") { case Seq(aT) => (
3535
Seq("l1" :: T(listID)(aT), "l2" :: T(listID)(aT)), T(listID)(aT), { case Seq(l1, l2) =>
36-
let("res" :: T(listID)(aT), if_ (l1 is consID) {
36+
let("res" :: T(listID)(aT), if_ (l1 `is` consID) {
3737
C(consID)(aT)(l1.getField(head), E(appendID)(aT)(l1.getField(tail), l2))
3838
} else_ {
3939
l2
@@ -45,7 +45,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
4545
// bogged down in quantifier instantiations due to [[SetEncoder]]
4646
val appendNoSpec = mkFunDef(appendNoSpecID)("A") { case Seq(aT) => (
4747
Seq("l1" :: T(listID)(aT), "l2" :: T(listID)(aT)), T(listID)(aT), { case Seq(l1, l2) =>
48-
if_ (l1 is consID) {
48+
if_ (l1 `is` consID) {
4949
C(consID)(aT)(l1.getField(head), E(appendNoSpecID)(aT)(l1.getField(tail), l2))
5050
} else_ {
5151
l2
@@ -55,7 +55,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
5555

5656
val flatMap = mkFunDef(flatMapID)("A","B") { case Seq(aT, bT) => (
5757
Seq("l" :: T(listID)(aT), "f" :: (aT =>: T(listID)(bT))), T(listID)(bT), { case Seq(l, f) =>
58-
if_ (l is consID) {
58+
if_ (l `is` consID) {
5959
appendNoSpec(bT)(f(l.getField(head)), E(flatMapID)(aT,bT)(l.getField(tail), f))
6060
} else_ {
6161
C(nilID)(bT)()
@@ -67,13 +67,13 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
6767
Seq("l1" :: T(listID)(aT), "l2" :: T(listID)(bT), "l3" :: T(listID)(cT),
6868
"f" :: (aT =>: T(listID)(bT)), "g" :: (bT =>: T(listID)(cT))), BooleanType(),
6969
{ case Seq(l1, l2, l3, f, g) =>
70-
(if_ (l3 is consID) {
70+
(if_ (l3 `is` consID) {
7171
Assume(E(assocID)(aT, bT, cT)(l1, l2, l3.getField(tail), f, g), E(true))
7272
} else_ {
73-
if_ (l2 is consID) {
73+
if_ (l2 `is` consID) {
7474
Assume(E(assocID)(aT, bT, cT)(l1, l2.getField(tail), g(l2.getField(head)), f, g), E(true))
7575
} else_ {
76-
if_ (l1 is consID) {
76+
if_ (l1 `is` consID) {
7777
Assume(E(assocID)(aT, bT, cT)(l1.getField(tail), f(l1.getField(head)), C(nilID)(cT)(), f, g), E(true))
7878
} else_ {
7979
E(true)
@@ -88,7 +88,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
8888

8989
val forall = mkFunDef(forallID)("A") { case Seq(aT) => (
9090
Seq("l" :: T(listID)(aT), "p" :: (aT =>: BooleanType())), BooleanType(), { case Seq(l, p) =>
91-
if_ (l is consID) {
91+
if_ (l `is` consID) {
9292
p(l.getField(head)) && E(forallID)(aT)(l.getField(tail), p)
9393
} else_ {
9494
E(true)
@@ -98,7 +98,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
9898

9999
val content = mkFunDef(contentID)("A") { case Seq(aT) => (
100100
Seq("l" :: T(listID)(aT)), SetType(aT), { case Seq(l) =>
101-
if_ (l is consID) {
101+
if_ (l `is` consID) {
102102
E(contentID)(aT)(l.getField(tail)).insert(l.getField(head))
103103
} else_ {
104104
FiniteSet(Seq.empty, aT)
@@ -108,7 +108,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
108108

109109
val partition = mkFunDef(partitionID)("A") { case Seq(aT) => (
110110
Seq("l" :: T(listID)(aT), "p" :: (aT =>: BooleanType())), T(T(listID)(aT), T(listID)(aT)), { case Seq(l, p) =>
111-
let("res" :: T(T(listID)(aT), T(listID)(aT)), if_ (l is consID) {
111+
let("res" :: T(T(listID)(aT), T(listID)(aT)), if_ (l `is` consID) {
112112
let("ptl" :: T(T(listID)(aT), T(listID)(aT)), E(partitionID)(aT)(l.getField(tail), p)) { ptl =>
113113
if_ (p(l.getField(head))) {
114114
E(C(consID)(aT)(l.getField(head), ptl._ts1), ptl._ts2)
@@ -130,7 +130,7 @@ class InductiveUnrollingSuite extends SolvingTestSuite with DatastructureUtils {
130130

131131
val sort = mkFunDef(sortID)("A") { case Seq(aT) => (
132132
Seq("l" :: T(listID)(aT), "lt" :: ((aT, aT) =>: BooleanType())), T(listID)(aT), { case Seq(l, lt) =>
133-
let("res" :: T(listID)(aT), if_ (l is consID) {
133+
let("res" :: T(listID)(aT), if_ (l `is` consID) {
134134
let("part" :: T(T(listID)(aT), T(listID)(aT)),
135135
E(partitionID)(aT)(l.getField(tail), \("x" :: aT)(x => lt(x, l.getField(head))))) { part =>
136136
let("less" :: T(listID)(aT), E(sortID)(aT)(part._ts1, lt)) { less =>

‎src/it/scala/inox/solvers/unrolling/SimpleUnrollingSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class SimpleUnrollingSuite extends SolvingTestSuite {
2727
val sizeID = FreshIdentifier("size")
2828
val sizeFd = mkFunDef(sizeID)("A") { case Seq(aT) => (
2929
Seq("l" :: T(listID)(aT)), IntegerType(), { case Seq(l) =>
30-
if_ (l is consID) {
30+
if_ (l `is` consID) {
3131
E(BigInt(1)) + E(sizeID)(aT)(l.getField(tail))
3232
} else_ {
3333
E(BigInt(0))

‎src/it/scala/inox/tip/TipPrintingSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class TipPrintingSuite extends AnyFunSuite with ResourceUtils {
1010

1111
val ctx = TestContext.empty
1212

13-
val filesWithCat = resourceFiles("regression/tip/", filter = _ endsWith ".tip", recursive = true) map { f =>
13+
val filesWithCat = resourceFiles("regression/tip/", filter = _ `endsWith` ".tip", recursive = true) map { f =>
1414
f.getParentFile.getName -> f
1515
}
1616

‎src/it/scala/inox/tip/TipSerializationSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class TipSerializationSuite extends AnyFunSpec with ResourceUtils {
1010

1111
val ctx = TestContext.empty
1212

13-
val filesWithCat = resourceFiles("regression/tip", filter = _ endsWith ".tip", recursive = true).map { f =>
13+
val filesWithCat = resourceFiles("regression/tip", filter = _ `endsWith` ".tip", recursive = true).map { f =>
1414
f.getParentFile.getName -> f
1515
}
1616

‎src/test/scala/inox/solvers/SemanticsSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ class SemanticsSuite extends AnyFunSuite {
2727
}
2828

2929
protected def test(name: String, tags: Tag*)(body: Context => Unit): Unit = {
30-
test(name, _ => true, tags : _*)(body)
30+
test(name, _ => true, tags*)(body)
3131
}
3232

3333
protected def test(name: String, filter: Context => Boolean, tags: Tag*)(body: Context => Unit): Unit = {
3434
// Workaround for a compiler crash caused by calling super.test
3535
def superTest(self: AnyFunSuite, name: String)(body: => Unit): Unit =
36-
self.test(name, tags: _*)(body)
36+
self.test(name, tags*)(body)
3737

3838
for {
3939
sname <- solverNames

‎src/test/scala/inox/utils/GraphsSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class GraphsSuite extends AnyFunSuite {
198198

199199
val seq = g.topSort
200200

201-
val before = assertBefore(seq)_
201+
val before = assertBefore(seq)
202202

203203
before(A, B)
204204
before(B, F)
@@ -226,7 +226,7 @@ class GraphsSuite extends AnyFunSuite {
226226

227227
val ns = gs.topSort
228228

229-
val before = assertBefore(ns)_
229+
val before = assertBefore(ns)
230230
before(c1, c2)
231231
before(c2, c3)
232232
before(c4, c2)

0 commit comments

Comments
 (0)