diff --git a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.exp b/move-compiler-v2/tests/ability-check/typing/dereference_reference.exp similarity index 69% rename from move-compiler-v2/tests/ability-check/typing/derefrence_reference.exp rename to move-compiler-v2/tests/ability-check/typing/dereference_reference.exp index b2f9787f..e6a141ad 100644 --- a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.exp +++ b/move-compiler-v2/tests/ability-check/typing/dereference_reference.exp @@ -1,43 +1,43 @@ Diagnostics: error: local `r` of type `R` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:6:16 + ┌─ tests/ability-check/typing/dereference_reference.move:6:16 │ 6 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `B` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:7:24 + ┌─ tests/ability-check/typing/dereference_reference.move:7:24 │ 7 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `R` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:8:17 + ┌─ tests/ability-check/typing/dereference_reference.move:8:17 │ 8 │ R{} = *&b.r; │ ^^^ reference content copied here error: local `r` of type `R` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:12:16 + ┌─ tests/ability-check/typing/dereference_reference.move:12:16 │ 12 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `B` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:13:24 + ┌─ tests/ability-check/typing/dereference_reference.move:13:24 │ 13 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `R` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:14:17 + ┌─ tests/ability-check/typing/dereference_reference.move:14:17 │ 14 │ R{} = *&b.r; │ ^^^ reference content copied here error: value of type `R` does not have the `copy` ability - ┌─ tests/ability-check/typing/derefrence_reference.move:15:21 + ┌─ tests/ability-check/typing/dereference_reference.move:15:21 │ 15 │ R{} = *&mut b.r; │ ^^^ reference content copied here diff --git a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.move b/move-compiler-v2/tests/ability-check/typing/dereference_reference.move similarity index 100% rename from move-compiler-v2/tests/ability-check/typing/derefrence_reference.move rename to move-compiler-v2/tests/ability-check/typing/dereference_reference.move diff --git a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.no-opt.exp b/move-compiler-v2/tests/ability-check/typing/dereference_reference.no-opt.exp similarity index 71% rename from move-compiler-v2/tests/ability-check/typing/derefrence_reference.no-opt.exp rename to move-compiler-v2/tests/ability-check/typing/dereference_reference.no-opt.exp index 25347885..f4ab810c 100644 --- a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.no-opt.exp +++ b/move-compiler-v2/tests/ability-check/typing/dereference_reference.no-opt.exp @@ -1,43 +1,43 @@ Diagnostics: error: local `r` of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:6:16 + ┌─ tests/reference-safety/dereference_reference.move:6:16 │ 6 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `M::B` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:7:24 + ┌─ tests/reference-safety/dereference_reference.move:7:24 │ 7 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:8:17 + ┌─ tests/reference-safety/dereference_reference.move:8:17 │ 8 │ R{} = *&b.r; │ ^^^ reference content copied here error: local `r` of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:12:16 + ┌─ tests/reference-safety/dereference_reference.move:12:16 │ 12 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `M::B` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:13:24 + ┌─ tests/reference-safety/dereference_reference.move:13:24 │ 13 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:14:17 + ┌─ tests/reference-safety/dereference_reference.move:14:17 │ 14 │ R{} = *&b.r; │ ^^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:15:21 + ┌─ tests/reference-safety/dereference_reference.move:15:21 │ 15 │ R{} = *&mut b.r; │ ^^^ reference content copied here diff --git a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.old.exp b/move-compiler-v2/tests/ability-check/typing/dereference_reference.old.exp similarity index 71% rename from move-compiler-v2/tests/ability-check/typing/derefrence_reference.old.exp rename to move-compiler-v2/tests/ability-check/typing/dereference_reference.old.exp index 25347885..f4ab810c 100644 --- a/move-compiler-v2/tests/ability-check/typing/derefrence_reference.old.exp +++ b/move-compiler-v2/tests/ability-check/typing/dereference_reference.old.exp @@ -1,43 +1,43 @@ Diagnostics: error: local `r` of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:6:16 + ┌─ tests/reference-safety/dereference_reference.move:6:16 │ 6 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `M::B` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:7:24 + ┌─ tests/reference-safety/dereference_reference.move:7:24 │ 7 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:8:17 + ┌─ tests/reference-safety/dereference_reference.move:8:17 │ 8 │ R{} = *&b.r; │ ^^^ reference content copied here error: local `r` of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:12:16 + ┌─ tests/reference-safety/dereference_reference.move:12:16 │ 12 │ R {} = *r; │ ^^ reference content copied here error: local `b` of type `M::B` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:13:24 + ┌─ tests/reference-safety/dereference_reference.move:13:24 │ 13 │ B { r: R{} } = *b; │ ^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:14:17 + ┌─ tests/reference-safety/dereference_reference.move:14:17 │ 14 │ R{} = *&b.r; │ ^^^ reference content copied here error: value of type `M::R` does not have the `copy` ability - ┌─ tests/reference-safety/derefrence_reference.move:15:21 + ┌─ tests/reference-safety/dereference_reference.move:15:21 │ 15 │ R{} = *&mut b.r; │ ^^^ reference content copied here diff --git a/move-compiler-v2/tests/checking/typing/derefrence.exp b/move-compiler-v2/tests/checking/typing/dereference.exp similarity index 100% rename from move-compiler-v2/tests/checking/typing/derefrence.exp rename to move-compiler-v2/tests/checking/typing/dereference.exp diff --git a/move-compiler-v2/tests/checking/typing/derefrence.move b/move-compiler-v2/tests/checking/typing/dereference.move similarity index 100% rename from move-compiler-v2/tests/checking/typing/derefrence.move rename to move-compiler-v2/tests/checking/typing/dereference.move diff --git a/move-compiler-v2/tests/checking/typing/derefrence_invalid.exp b/move-compiler-v2/tests/checking/typing/dereference_invalid.exp similarity index 65% rename from move-compiler-v2/tests/checking/typing/derefrence_invalid.exp rename to move-compiler-v2/tests/checking/typing/dereference_invalid.exp index 17539632..30c0f1f0 100644 --- a/move-compiler-v2/tests/checking/typing/derefrence_invalid.exp +++ b/move-compiler-v2/tests/checking/typing/dereference_invalid.exp @@ -1,79 +1,79 @@ Diagnostics: error: expected `bool` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:6:10 + ┌─ tests/checking/typing/dereference_invalid.move:6:10 │ 6 │ (*x : bool); │ ^^ error: expected `&u64` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:7:10 + ┌─ tests/checking/typing/dereference_invalid.move:7:10 │ 7 │ (*x_mut: &u64); │ ^^^^^^ error: expected `X` but found a value of type `S` - ┌─ tests/checking/typing/derefrence_invalid.move:9:10 + ┌─ tests/checking/typing/dereference_invalid.move:9:10 │ 9 │ (*s: X); │ ^^ error: expected `bool` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:10:12 + ┌─ tests/checking/typing/dereference_invalid.move:10:12 │ 10 │ (*&s.f: bool); │ ^^^ error: expected `&u64` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:11:10 + ┌─ tests/checking/typing/dereference_invalid.move:11:10 │ 11 │ (s.f: &u64); │ ^^^ error: expected `&X` but found a value of type `X` - ┌─ tests/checking/typing/derefrence_invalid.move:12:12 + ┌─ tests/checking/typing/dereference_invalid.move:12:12 │ 12 │ (*&s.x: &X); │ ^^^ error: cannot borrow from a reference - ┌─ tests/checking/typing/derefrence_invalid.move:12:11 + ┌─ tests/checking/typing/dereference_invalid.move:12:11 │ 12 │ (*&s.x: &X); │ ^^^^ error: expected `X` but found a value of type `S` - ┌─ tests/checking/typing/derefrence_invalid.move:14:10 + ┌─ tests/checking/typing/dereference_invalid.move:14:10 │ 14 │ (*s_mut: X); │ ^^^^^^ error: expected `bool` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:15:12 + ┌─ tests/checking/typing/dereference_invalid.move:15:12 │ 15 │ (*&s_mut.f: bool); │ ^^^^^^^ error: expected `(bool, u64)` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:16:16 + ┌─ tests/checking/typing/dereference_invalid.move:16:16 │ 16 │ (*&mut s_mut.f: (bool, u64)); │ ^^^^^^^ error: expected `&u64` but found a value of type `u64` - ┌─ tests/checking/typing/derefrence_invalid.move:17:10 + ┌─ tests/checking/typing/dereference_invalid.move:17:10 │ 17 │ (s_mut.f: &u64); │ ^^^^^^^ error: expected `(X, S)` but found a value of type `X` - ┌─ tests/checking/typing/derefrence_invalid.move:18:12 + ┌─ tests/checking/typing/dereference_invalid.move:18:12 │ 18 │ (*&s_mut.x: (X, S)); │ ^^^^^^^ error: expected expression with no value but found `X` - ┌─ tests/checking/typing/derefrence_invalid.move:19:16 + ┌─ tests/checking/typing/dereference_invalid.move:19:16 │ 19 │ (*&mut s_mut.x: ()); │ ^^^^^^^ diff --git a/move-compiler-v2/tests/checking/typing/derefrence_invalid.move b/move-compiler-v2/tests/checking/typing/dereference_invalid.move similarity index 100% rename from move-compiler-v2/tests/checking/typing/derefrence_invalid.move rename to move-compiler-v2/tests/checking/typing/dereference_invalid.move diff --git a/move-compiler/tests/move_check/typing/derefrence.move b/move-compiler/tests/move_check/typing/dereference.move similarity index 100% rename from move-compiler/tests/move_check/typing/derefrence.move rename to move-compiler/tests/move_check/typing/dereference.move diff --git a/move-compiler/tests/move_check/typing/derefrence_invalid.exp b/move-compiler/tests/move_check/typing/dereference_invalid.exp similarity index 84% rename from move-compiler/tests/move_check/typing/derefrence_invalid.exp rename to move-compiler/tests/move_check/typing/dereference_invalid.exp index cea8ee30..4b305897 100644 --- a/move-compiler/tests/move_check/typing/derefrence_invalid.exp +++ b/move-compiler/tests/move_check/typing/dereference_invalid.exp @@ -1,5 +1,5 @@ error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:6:15 + ┌─ tests/move_check/typing/dereference_invalid.move:6:15 │ 5 │ fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){ │ --- Given: 'u64' @@ -10,7 +10,7 @@ error[E04007]: incompatible types │ Expected: 'bool' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:7:18 + ┌─ tests/move_check/typing/dereference_invalid.move:7:18 │ 5 │ fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){ │ --- Given: 'u64' @@ -22,7 +22,7 @@ error[E04007]: incompatible types │ Expected: '&u64' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:9:14 + ┌─ tests/move_check/typing/dereference_invalid.move:9:14 │ 5 │ fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){ │ - Given: '0x8675309::M::S' @@ -34,7 +34,7 @@ error[E04007]: incompatible types │ Expected: '0x8675309::M::X' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:10:17 + ┌─ tests/move_check/typing/dereference_invalid.move:10:17 │ 3 │ struct S has copy, drop { f: u64, x: X } │ --- Given: 'u64' @@ -46,7 +46,7 @@ error[E04007]: incompatible types │ Expected: 'bool' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:11:15 + ┌─ tests/move_check/typing/dereference_invalid.move:11:15 │ 3 │ struct S has copy, drop { f: u64, x: X } │ --- Given: 'u64' @@ -58,7 +58,7 @@ error[E04007]: incompatible types │ Expected: '&u64' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:12:17 + ┌─ tests/move_check/typing/dereference_invalid.move:12:17 │ 3 │ struct S has copy, drop { f: u64, x: X } │ - Given: '0x8675309::M::X' @@ -70,7 +70,7 @@ error[E04007]: incompatible types │ Expected: '&0x8675309::M::X' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:14:18 + ┌─ tests/move_check/typing/dereference_invalid.move:14:18 │ 5 │ fun t0(x: &u64, x_mut: &mut u64, s: &S, s_mut: &mut S){ │ - Given: '0x8675309::M::S' @@ -82,7 +82,7 @@ error[E04007]: incompatible types │ Expected: '0x8675309::M::X' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:15:21 + ┌─ tests/move_check/typing/dereference_invalid.move:15:21 │ 3 │ struct S has copy, drop { f: u64, x: X } │ --- Given: 'u64' @@ -94,7 +94,7 @@ error[E04007]: incompatible types │ Expected: 'bool' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:16:25 + ┌─ tests/move_check/typing/dereference_invalid.move:16:25 │ 3 │ struct S has copy, drop { f: u64, x: X } │ --- Given: 'u64' @@ -106,7 +106,7 @@ error[E04007]: incompatible types │ Expected: '(bool, u64)' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:17:19 + ┌─ tests/move_check/typing/dereference_invalid.move:17:19 │ 3 │ struct S has copy, drop { f: u64, x: X } │ --- Given: 'u64' @@ -118,7 +118,7 @@ error[E04007]: incompatible types │ Expected: '&u64' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:18:21 + ┌─ tests/move_check/typing/dereference_invalid.move:18:21 │ 3 │ struct S has copy, drop { f: u64, x: X } │ - Given: '0x8675309::M::X' @@ -130,7 +130,7 @@ error[E04007]: incompatible types │ Expected: '(0x8675309::M::X, 0x8675309::M::S)' error[E04007]: incompatible types - ┌─ tests/move_check/typing/derefrence_invalid.move:19:25 + ┌─ tests/move_check/typing/dereference_invalid.move:19:25 │ 3 │ struct S has copy, drop { f: u64, x: X } │ - Given: '0x8675309::M::X' diff --git a/move-compiler/tests/move_check/typing/derefrence_invalid.move b/move-compiler/tests/move_check/typing/dereference_invalid.move similarity index 100% rename from move-compiler/tests/move_check/typing/derefrence_invalid.move rename to move-compiler/tests/move_check/typing/dereference_invalid.move diff --git a/move-compiler/tests/move_check/typing/derefrence_reference.exp b/move-compiler/tests/move_check/typing/dereference_reference.exp similarity index 86% rename from move-compiler/tests/move_check/typing/derefrence_reference.exp rename to move-compiler/tests/move_check/typing/dereference_reference.exp index 027ca6cc..eb3f6b32 100644 --- a/move-compiler/tests/move_check/typing/derefrence_reference.exp +++ b/move-compiler/tests/move_check/typing/dereference_reference.exp @@ -1,5 +1,5 @@ error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:6:16 + ┌─ tests/move_check/typing/dereference_reference.move:6:16 │ 2 │ struct R {} │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -10,7 +10,7 @@ error[E05001]: ability constraint not satisfied │ ^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:7:24 + ┌─ tests/move_check/typing/dereference_reference.move:7:24 │ 3 │ struct B { r: R } │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -22,7 +22,7 @@ error[E05001]: ability constraint not satisfied │ ^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:8:15 + ┌─ tests/move_check/typing/dereference_reference.move:8:15 │ 2 │ struct R {} │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -33,7 +33,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:12:16 + ┌─ tests/move_check/typing/dereference_reference.move:12:16 │ 2 │ struct R {} │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -44,7 +44,7 @@ error[E05001]: ability constraint not satisfied │ ^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:13:24 + ┌─ tests/move_check/typing/dereference_reference.move:13:24 │ 3 │ struct B { r: R } │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -56,7 +56,7 @@ error[E05001]: ability constraint not satisfied │ ^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:14:15 + ┌─ tests/move_check/typing/dereference_reference.move:14:15 │ 2 │ struct R {} │ - To satisfy the constraint, the 'copy' ability would need to be added here @@ -67,7 +67,7 @@ error[E05001]: ability constraint not satisfied │ ^^^^^ Invalid dereference. Dereference requires the 'copy' ability error[E05001]: ability constraint not satisfied - ┌─ tests/move_check/typing/derefrence_reference.move:15:15 + ┌─ tests/move_check/typing/dereference_reference.move:15:15 │ 2 │ struct R {} │ - To satisfy the constraint, the 'copy' ability would need to be added here diff --git a/move-compiler/tests/move_check/typing/derefrence_reference.move b/move-compiler/tests/move_check/typing/dereference_reference.move similarity index 100% rename from move-compiler/tests/move_check/typing/derefrence_reference.move rename to move-compiler/tests/move_check/typing/dereference_reference.move