diff --git a/Cargo.lock b/Cargo.lock index 47f488ad..ce1a8898 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -345,9 +345,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c0c443f6dceb3a1cb7607c87501aa91e4b9c976044f725c2a74ca2152c91a4" +checksum = "da408b722765c64aad796c666b756aa1dda2a6c1b44f98797f2d8ea8f197746f" dependencies = [ "console", "once_cell", diff --git a/nac3core/Cargo.toml b/nac3core/Cargo.toml index ab11b7b9..ab51a8bc 100644 --- a/nac3core/Cargo.toml +++ b/nac3core/Cargo.toml @@ -19,7 +19,7 @@ features = ["llvm13-0", "target-x86", "target-arm", "target-riscv", "no-libffi-l [dev-dependencies] test-case = "1.2.0" indoc = "1.0" -insta = "1.5" +insta = "=1.11.0" [build-dependencies] regex = "1" diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-2.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-2.snap deleted file mode 100644 index 73e31784..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-2.snap +++ /dev/null @@ -1,14 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Class {\nname: \"Generic_A\",\nancestors: [\"{class: Generic_A, params: [\\\"var6\\\"]}\", \"{class: B, params: []}\"],\nfields: [\"aa\", \"a\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"foo\", \"fn[[b=var5], none]\"), (\"fun\", \"fn[[a=int32], var6]\")],\ntype_vars: [\"var6\"]\n}\n", - "Function {\nname: \"Generic_A.__init__\",\nsig: \"fn[[], none]\",\nvar_id: [6]\n}\n", - "Function {\nname: \"Generic_A.fun\",\nsig: \"fn[[a=int32], var6]\",\nvar_id: [6]\n}\n", - "Class {\nname: \"B\",\nancestors: [\"{class: B, params: []}\"],\nfields: [\"aa\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"foo\", \"fn[[b=var5], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"B.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"B.foo\",\nsig: \"fn[[b=var5], none]\",\nvar_id: []\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-3.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-3.snap deleted file mode 100644 index 2b1f1eeb..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-3.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Function {\nname: \"foo\",\nsig: \"fn[[a=list[int32], b=tuple[var5, float]], A[5->B, 6->bool]]\",\nvar_id: []\n}\n", - "Class {\nname: \"A\",\nancestors: [\"{class: A, params: [\\\"var5\\\", \\\"var6\\\"]}\"],\nfields: [\"a\", \"b\"],\nmethods: [(\"__init__\", \"fn[[v=var6], none]\"), (\"fun\", \"fn[[a=var5], var6]\")],\ntype_vars: [\"var5\", \"var6\"]\n}\n", - "Function {\nname: \"A.__init__\",\nsig: \"fn[[v=var6], none]\",\nvar_id: [6]\n}\n", - "Function {\nname: \"A.fun\",\nsig: \"fn[[a=var5], var6]\",\nvar_id: [6]\n}\n", - "Function {\nname: \"gfun\",\nsig: \"fn[[a=A[5->list[float], 6->int32]], none]\",\nvar_id: []\n}\n", - "Class {\nname: \"B\",\nancestors: [\"{class: B, params: []}\"],\nfields: [],\nmethods: [(\"__init__\", \"fn[[], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"B.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-4.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-4.snap deleted file mode 100644 index 97380a44..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-4.snap +++ /dev/null @@ -1,17 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Class {\nname: \"A\",\nancestors: [\"{class: A, params: [\\\"var5\\\"]}\"],\nfields: [\"a\", \"b\", \"c\"],\nmethods: [(\"__init__\", \"fn[[t=var5], none]\"), (\"fun\", \"fn[[a=int32, b=var5], list[virtual[B[6->bool]]]]\"), (\"foo\", \"fn[[c=C], none]\")],\ntype_vars: [\"var5\"]\n}\n", - "Function {\nname: \"A.__init__\",\nsig: \"fn[[t=var5], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"A.fun\",\nsig: \"fn[[a=int32, b=var5], list[virtual[B[6->bool]]]]\",\nvar_id: []\n}\n", - "Function {\nname: \"A.foo\",\nsig: \"fn[[c=C], none]\",\nvar_id: []\n}\n", - "Class {\nname: \"B\",\nancestors: [\"{class: B, params: [\\\"var6\\\"]}\", \"{class: A, params: [\\\"float\\\"]}\"],\nfields: [\"a\", \"b\", \"c\", \"d\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[a=int32, b=var5], list[virtual[B[6->bool]]]]\"), (\"foo\", \"fn[[c=C], none]\")],\ntype_vars: [\"var6\"]\n}\n", - "Function {\nname: \"B.__init__\",\nsig: \"fn[[], none]\",\nvar_id: [6]\n}\n", - "Function {\nname: \"B.fun\",\nsig: \"fn[[a=int32, b=var5], list[virtual[B[6->bool]]]]\",\nvar_id: [6]\n}\n", - "Class {\nname: \"C\",\nancestors: [\"{class: C, params: []}\", \"{class: B, params: [\\\"bool\\\"]}\", \"{class: A, params: [\\\"float\\\"]}\"],\nfields: [\"a\", \"b\", \"c\", \"d\", \"e\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[a=int32, b=var5], list[virtual[B[6->bool]]]]\"), (\"foo\", \"fn[[c=C], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"C.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-5.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-5.snap deleted file mode 100644 index 472c4507..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-5.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Class {\nname: \"A\",\nancestors: [\"{class: A, params: [\\\"var5\\\", \\\"var6\\\"]}\"],\nfields: [\"a\", \"b\"],\nmethods: [(\"__init__\", \"fn[[a=A[5->float, 6->bool], b=B], none]\"), (\"fun\", \"fn[[a=A[5->float, 6->bool]], A[5->bool, 6->int32]]\")],\ntype_vars: [\"var5\", \"var6\"]\n}\n", - "Function {\nname: \"A.__init__\",\nsig: \"fn[[a=A[5->float, 6->bool], b=B], none]\",\nvar_id: [6]\n}\n", - "Function {\nname: \"A.fun\",\nsig: \"fn[[a=A[5->float, 6->bool]], A[5->bool, 6->int32]]\",\nvar_id: [6]\n}\n", - "Class {\nname: \"B\",\nancestors: [\"{class: B, params: []}\", \"{class: A, params: [\\\"int64\\\", \\\"bool\\\"]}\"],\nfields: [\"a\", \"b\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[a=A[5->float, 6->bool]], A[5->bool, 6->int32]]\"), (\"foo\", \"fn[[b=B], B]\"), (\"bar\", \"fn[[a=A[5->list[B], 6->int32]], tuple[A[5->virtual[A[5->B, 6->int32]], 6->bool], B]]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"B.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"B.foo\",\nsig: \"fn[[b=B], B]\",\nvar_id: []\n}\n", - "Function {\nname: \"B.bar\",\nsig: \"fn[[a=A[5->list[B], 6->int32]], tuple[A[5->virtual[A[5->B, 6->int32]], 6->bool], B]]\",\nvar_id: []\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-6.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-6.snap deleted file mode 100644 index b2bd4647..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze-6.snap +++ /dev/null @@ -1,19 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Class {\nname: \"A\",\nancestors: [\"{class: A, params: []}\"],\nfields: [\"a\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[b=B], none]\"), (\"foo\", \"fn[[a=var5, b=var6], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"A.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"A.fun\",\nsig: \"fn[[b=B], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"A.foo\",\nsig: \"fn[[a=var5, b=var6], none]\",\nvar_id: [6]\n}\n", - "Class {\nname: \"B\",\nancestors: [\"{class: B, params: []}\", \"{class: C, params: []}\", \"{class: A, params: []}\"],\nfields: [\"a\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[b=B], none]\"), (\"foo\", \"fn[[a=var5, b=var6], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"B.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", - "Class {\nname: \"C\",\nancestors: [\"{class: C, params: []}\", \"{class: A, params: []}\"],\nfields: [\"a\"],\nmethods: [(\"__init__\", \"fn[[], none]\"), (\"fun\", \"fn[[b=B], none]\"), (\"foo\", \"fn[[a=var5, b=var6], none]\")],\ntype_vars: []\n}\n", - "Function {\nname: \"C.__init__\",\nsig: \"fn[[], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"C.fun\",\nsig: \"fn[[b=B], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"foo\",\nsig: \"fn[[a=A], none]\",\nvar_id: []\n}\n", - "Function {\nname: \"ff\",\nsig: \"fn[[a=var5], var6]\",\nvar_id: [6]\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze.snap deleted file mode 100644 index d4e96445..00000000 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__analyze.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: nac3core/src/toplevel/test.rs -assertion_line: 541 -expression: res_vec - ---- -[ - "Class {\nname: \"A\",\nancestors: [\"{class: A, params: []}\"],\nfields: [],\nmethods: [],\ntype_vars: []\n}\n", -] diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__generic_class.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__generic_class.snap index f8d39366..73e31784 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__generic_class.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__generic_class.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__inheritance_override.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__inheritance_override.snap index 2067a56e..97380a44 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__inheritance_override.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__inheritance_override.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__list_tuple_generic.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__list_tuple_generic.snap index 7527143d..2b1f1eeb 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__list_tuple_generic.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__list_tuple_generic.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__self1.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__self1.snap index d6886ab2..472c4507 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__self1.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__self1.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_class_compose.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_class_compose.snap index ab0f0534..b2bd4647 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_class_compose.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_class_compose.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_pass_in_class.snap b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_pass_in_class.snap index e9b20454..d4e96445 100644 --- a/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_pass_in_class.snap +++ b/nac3core/src/toplevel/snapshots/nac3core__toplevel__test__test_analyze__simple_pass_in_class.snap @@ -1,5 +1,6 @@ --- source: nac3core/src/toplevel/test.rs +assertion_line: 541 expression: res_vec --- diff --git a/nac3parser/Cargo.toml b/nac3parser/Cargo.toml index 926b2a29..cbf0b9a3 100644 --- a/nac3parser/Cargo.toml +++ b/nac3parser/Cargo.toml @@ -21,4 +21,4 @@ phf = { version = "0.9", features = ["macros"] } ahash = "0.7.2" [dev-dependencies] -insta = "1.5" +insta = "=1.11.0" diff --git a/nac3parser/src/snapshots/nac3parser__parser__tests__parse_empty.snap b/nac3parser/src/snapshots/nac3parser__parser__tests__parse_empty.snap index 64d89c15..901b7242 100644 --- a/nac3parser/src/snapshots/nac3parser__parser__tests__parse_empty.snap +++ b/nac3parser/src/snapshots/nac3parser__parser__tests__parse_empty.snap @@ -1,5 +1,7 @@ --- -source: parser/src/parser.rs +source: nac3parser/src/parser.rs +assertion_line: 90 expression: parse_ast + --- []