Resolve rebase conflicts

Author: Linyxus

tests/neg-custom-args/captures/linear-buffer-2.check

@@ -2,68 +2,47 @@
 Separation failure: Illegal access to (buf : Buffer[Int]^), which was used as a prefix to consume method append
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of parameter buf
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter buf
 11 |  val buf1: Buffer[Int]^ = buf.append(1)
    |                           ---
    |                           The capability was consumed here.
 12 |  val buf2 = buf1.append(2) // OK
 13 |  val buf3 = buf.append(3) // error
    |             ^^^
-<<<<<<< HEAD
-   | Separation failure: Illegal access to (buf : Buffer[Int]^), which was used as a prefix to consume method append
-   | on line 11 and therefore is no longer available.
-   |
-   | where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter buf
-=======
    |             Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer-2.scala:20:13 ---------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 18 |    if ??? then buf1.append(2) // OK
    |                ----
    |                The capability was consumed here.
 19 |    else buf1.append(3) // OK
 20 |  val buf3 = buf1.append(4) // error
    |             ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
-   |on line 18 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |             Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer-2.scala:28:13 ---------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 25 |    case 1 => buf1.append(2) // OK
    |              ----
    |              The capability was consumed here.
 26 |    case 2 => buf1.append(2)
 27 |    case _ => buf1.append(3)
 28 |  val buf3 = buf1.append(4) // error
    |             ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
-   |on line 25 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |             Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer-2.scala:38:13 ---------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 33 |    case 1 => buf1.append(2) // OK
    |              ----
    |              The capability was consumed here.
@@ -73,15 +52,8 @@ where:    ^ refers to a fresh root capability in the type of value buf1
 37 |    case 5 => buf1.append(5)
 38 |  val buf3 = buf1.append(4) // error
    |             ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was used as a prefix to consume method append
-   |on line 33 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |             Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer-2.scala:42:4 ----------------------------------------------------
 42 |    buf.append(1)  // error
    |    ^^^

tests/neg-custom-args/captures/linear-buffer.check

@@ -37,68 +37,47 @@
 Separation failure: Illegal access to (buf : Buffer[Int]^), which was passed as a consume parameter to method app
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of parameter buf
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter buf
 21 |  val buf1: Buffer[Int]^ = app(buf, 1)
    |                               ---
    |                               The capability was consumed here.
 22 |  val buf2 = app(buf1, 2) // OK
 23 |  val buf3 = app(buf, 3) // error
    |                 ^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf : Buffer[Int]^), which was passed as a consume parameter to method app
-   |on line 21 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter buf
-=======
    |                 Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer.scala:30:17 -----------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 28 |    if ??? then app(buf1, 2) // OK
    |                    ----
    |                    The capability was consumed here.
 29 |    else app(buf1, 3) // OK
 30 |  val buf3 = app(buf1, 4) // error
    |                 ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
-   |on line 28 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |                 Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer.scala:38:17 -----------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 35 |    case 1 => app(buf1, 2) // OK
    |                  ----
    |                  The capability was consumed here.
 36 |    case 2 => app(buf1, 2)
 37 |    case _ => app(buf1, 3)
 38 |  val buf3 = app(buf1, 4) // error
    |                 ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
-   |on line 35 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |                 Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer.scala:48:17 -----------------------------------------------------
 Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of value buf1
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
 43 |    case 1 => app(buf1, 2) // OK
    |                  ----
    |                  The capability was consumed here.
@@ -108,15 +87,8 @@ where:    ^ refers to a fresh root capability in the type of value buf1
 47 |    case 5 => app(buf1, 5)
 48 |  val buf3 = app(buf1, 4) // error
    |                 ^^^^
-<<<<<<< HEAD
-   |Separation failure: Illegal access to (buf1 : Buffer[Int]^), which was passed as a consume parameter to method app
-   |on line 43 and therefore is no longer available.
-   |
-   |where:    ^ refers to a fresh root capability classified as Unscoped in the type of value buf1
-=======
    |                 Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/linear-buffer.scala:52:8 ------------------------------------------------------
 52 |    app(buf, 1)  // error
    |        ^^^

tests/neg-custom-args/captures/sep-consume.check

@@ -7,42 +7,28 @@
 Separation failure: Illegal access to (x : Ref^), which was passed as a consume parameter to method bad
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of parameter x
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter x
 18 |  val rx: () => Unit = bad(f)  // hides x.rd in the resulting `cap`
    |                           -
    |                           The capability was consumed here.
 19 |  x.put(42)  // error
    |  ^
-<<<<<<< HEAD
-   |  Separation failure: Illegal access to (x : Ref^), which was passed as a consume parameter to method bad
-   |  on line 18 and therefore is no longer available.
-   |
-   |  where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter x
-=======
    |  Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/sep-consume.scala:21:16 -------------------------------------------------------
 Separation failure: Illegal access to (x : Ref^), which was passed as a consume parameter to method bad
 and therefore is no longer available.
 
-where:    ^ refers to a fresh root capability in the type of parameter x
+where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter x
 18 |  val rx: () => Unit = bad(f)  // hides x.rd in the resulting `cap`
    |                           -
    |                           The capability was consumed here.
 19 |  x.put(42)  // error
 20 |  x.get      // ok rd/rd
 21 |  par(rx, () => x.put(42))  // error
    |                ^
-<<<<<<< HEAD
-   |         Separation failure: Illegal access to (x : Ref^), which was passed as a consume parameter to method bad
-   |         on line 18 and therefore is no longer available.
-   |
-   |         where:    ^ refers to a fresh root capability classified as Unscoped in the type of parameter x
-=======
    |                Then, it was used here
 
->>>>>>> 2ee70f2604 (Update checkfiles)
 -- Error: tests/neg-custom-args/captures/sep-consume.scala:26:16 -------------------------------------------------------
 26 |  def foo = bad(f) // error
    |                ^