From 134fe4f566d94fd4ca91c6417fab0ae7b3e4275f Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Thu, 20 Dec 2018 16:45:54 +0000
Subject: Fix the tests and fix the precommit hook

---
 .../inline/err/0001_array_type_missing_semi.rs     |  1 +
 .../inline/err/0001_array_type_missing_semi.txt    | 27 ++++++++
 .../parser/inline/err/0002_misplaced_label_err.rs  |  3 +
 .../parser/inline/err/0002_misplaced_label_err.txt | 28 ++++++++
 .../inline/err/0003_pointer_type_no_mutability.rs  |  1 +
 .../inline/err/0003_pointer_type_no_mutability.txt | 17 +++++
 .../tests/data/parser/inline/err/0004_impl_type.rs |  4 ++
 .../data/parser/inline/err/0004_impl_type.txt      | 79 ++++++++++++++++++++++
 .../inline/err/0005_fn_pointer_type_missing_fn.rs  |  1 +
 .../inline/err/0005_fn_pointer_type_missing_fn.txt | 23 +++++++
 .../parser/inline/err/0006_unsafe_block_in_mod.rs  |  1 +
 .../parser/inline/err/0006_unsafe_block_in_mod.txt | 35 ++++++++++
 12 files changed, 220 insertions(+)
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs
 create mode 100644 crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt

(limited to 'crates/ra_syntax/tests/data/parser/inline/err')

diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs
new file mode 100644
index 000000000..a94851443
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.rs
@@ -0,0 +1 @@
+type T = [() 92];
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt
new file mode 100644
index 000000000..036363587
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt
@@ -0,0 +1,27 @@
+SOURCE_FILE@[0; 18)
+  TYPE_DEF@[0; 12)
+    TYPE_KW@[0; 4)
+    WHITESPACE@[4; 5)
+    NAME@[5; 6)
+      IDENT@[5; 6) "T"
+    WHITESPACE@[6; 7)
+    EQ@[7; 8)
+    WHITESPACE@[8; 9)
+    SLICE_TYPE@[9; 12)
+      L_BRACK@[9; 10)
+      TUPLE_TYPE@[10; 12)
+        L_PAREN@[10; 11)
+        R_PAREN@[11; 12)
+        err: `expected `;` or `]``
+        err: `expected SEMI`
+  WHITESPACE@[12; 13)
+  err: `expected an item`
+  ERROR@[13; 15)
+    INT_NUMBER@[13; 15) "92"
+    err: `expected an item`
+  ERROR@[15; 16)
+    R_BRACK@[15; 16)
+    err: `expected an item`
+  ERROR@[16; 17)
+    SEMI@[16; 17)
+  WHITESPACE@[17; 18)
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs
new file mode 100644
index 000000000..a2164c510
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.rs
@@ -0,0 +1,3 @@
+fn main() {
+    'loop: impl
+}
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt
new file mode 100644
index 000000000..75533ecc1
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt
@@ -0,0 +1,28 @@
+SOURCE_FILE@[0; 30)
+  FN_DEF@[0; 29)
+    FN_KW@[0; 2)
+    WHITESPACE@[2; 3)
+    NAME@[3; 7)
+      IDENT@[3; 7) "main"
+    PARAM_LIST@[7; 9)
+      L_PAREN@[7; 8)
+      R_PAREN@[8; 9)
+    WHITESPACE@[9; 10)
+    BLOCK@[10; 29)
+      L_CURLY@[10; 11)
+      WHITESPACE@[11; 16)
+      EXPR_STMT@[16; 22)
+        ERROR@[16; 22)
+          LABEL@[16; 22)
+            LIFETIME@[16; 21) "'loop"
+            COLON@[21; 22)
+            err: `expected a loop`
+            err: `expected SEMI`
+      WHITESPACE@[22; 23)
+      IMPL_ITEM@[23; 27)
+        IMPL_KW@[23; 27)
+        err: `expected type`
+        err: `expected `{``
+      WHITESPACE@[27; 28)
+      R_CURLY@[28; 29)
+  WHITESPACE@[29; 30)
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs
new file mode 100644
index 000000000..fae705131
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.rs
@@ -0,0 +1 @@
+type T = *();
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt
new file mode 100644
index 000000000..189aa563e
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt
@@ -0,0 +1,17 @@
+SOURCE_FILE@[0; 14)
+  TYPE_DEF@[0; 13)
+    TYPE_KW@[0; 4)
+    WHITESPACE@[4; 5)
+    NAME@[5; 6)
+      IDENT@[5; 6) "T"
+    WHITESPACE@[6; 7)
+    EQ@[7; 8)
+    WHITESPACE@[8; 9)
+    POINTER_TYPE@[9; 12)
+      STAR@[9; 10)
+      err: `expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)`
+      TUPLE_TYPE@[10; 12)
+        L_PAREN@[10; 11)
+        R_PAREN@[11; 12)
+    SEMI@[12; 13)
+  WHITESPACE@[13; 14)
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs
new file mode 100644
index 000000000..b8c7b65e3
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.rs
@@ -0,0 +1,4 @@
+impl Type {}
+impl Trait1 for T {}
+impl impl NotType {}
+impl Trait2 for impl NotType {}
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt
new file mode 100644
index 000000000..7279d5cae
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt
@@ -0,0 +1,79 @@
+SOURCE_FILE@[0; 87)
+  IMPL_ITEM@[0; 12)
+    IMPL_KW@[0; 4)
+    WHITESPACE@[4; 5)
+    PATH_TYPE@[5; 9)
+      PATH@[5; 9)
+        PATH_SEGMENT@[5; 9)
+          NAME_REF@[5; 9)
+            IDENT@[5; 9) "Type"
+    WHITESPACE@[9; 10)
+    ITEM_LIST@[10; 12)
+      L_CURLY@[10; 11)
+      R_CURLY@[11; 12)
+  WHITESPACE@[12; 13)
+  IMPL_ITEM@[13; 33)
+    IMPL_KW@[13; 17)
+    WHITESPACE@[17; 18)
+    PATH_TYPE@[18; 24)
+      PATH@[18; 24)
+        PATH_SEGMENT@[18; 24)
+          NAME_REF@[18; 24)
+            IDENT@[18; 24) "Trait1"
+    WHITESPACE@[24; 25)
+    FOR_KW@[25; 28)
+    WHITESPACE@[28; 29)
+    PATH_TYPE@[29; 30)
+      PATH@[29; 30)
+        PATH_SEGMENT@[29; 30)
+          NAME_REF@[29; 30)
+            IDENT@[29; 30) "T"
+    WHITESPACE@[30; 31)
+    ITEM_LIST@[31; 33)
+      L_CURLY@[31; 32)
+      R_CURLY@[32; 33)
+  WHITESPACE@[33; 34)
+  IMPL_ITEM@[34; 38)
+    IMPL_KW@[34; 38)
+    err: `expected trait or type`
+    err: `expected `{``
+  WHITESPACE@[38; 39)
+  IMPL_ITEM@[39; 54)
+    IMPL_KW@[39; 43)
+    WHITESPACE@[43; 44)
+    PATH_TYPE@[44; 51)
+      PATH@[44; 51)
+        PATH_SEGMENT@[44; 51)
+          NAME_REF@[44; 51)
+            IDENT@[44; 51) "NotType"
+    WHITESPACE@[51; 52)
+    ITEM_LIST@[52; 54)
+      L_CURLY@[52; 53)
+      R_CURLY@[53; 54)
+  WHITESPACE@[54; 55)
+  IMPL_ITEM@[55; 70)
+    IMPL_KW@[55; 59)
+    WHITESPACE@[59; 60)
+    PATH_TYPE@[60; 66)
+      PATH@[60; 66)
+        PATH_SEGMENT@[60; 66)
+          NAME_REF@[60; 66)
+            IDENT@[60; 66) "Trait2"
+    WHITESPACE@[66; 67)
+    FOR_KW@[67; 70)
+    err: `expected trait or type`
+    err: `expected `{``
+  WHITESPACE@[70; 71)
+  IMPL_ITEM@[71; 86)
+    IMPL_KW@[71; 75)
+    WHITESPACE@[75; 76)
+    PATH_TYPE@[76; 83)
+      PATH@[76; 83)
+        PATH_SEGMENT@[76; 83)
+          NAME_REF@[76; 83)
+            IDENT@[76; 83) "NotType"
+    WHITESPACE@[83; 84)
+    ITEM_LIST@[84; 86)
+      L_CURLY@[84; 85)
+      R_CURLY@[85; 86)
+  WHITESPACE@[86; 87)
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
new file mode 100644
index 000000000..f014914ff
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.rs
@@ -0,0 +1 @@
+type F = unsafe ();
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
new file mode 100644
index 000000000..f97db4bff
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt
@@ -0,0 +1,23 @@
+SOURCE_FILE@[0; 20)
+  TYPE_DEF@[0; 15)
+    TYPE_KW@[0; 4)
+    WHITESPACE@[4; 5)
+    NAME@[5; 6)
+      IDENT@[5; 6) "F"
+    WHITESPACE@[6; 7)
+    EQ@[7; 8)
+    WHITESPACE@[8; 9)
+    UNSAFE_KW@[9; 15)
+    err: `expected `fn``
+    err: `expected SEMI`
+  WHITESPACE@[15; 16)
+  err: `expected an item`
+  ERROR@[16; 17)
+    L_PAREN@[16; 17)
+    err: `expected an item`
+  ERROR@[17; 18)
+    R_PAREN@[17; 18)
+    err: `expected an item`
+  ERROR@[18; 19)
+    SEMI@[18; 19)
+  WHITESPACE@[19; 20)
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs
new file mode 100644
index 000000000..26141e904
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.rs
@@ -0,0 +1 @@
+fn foo(){} unsafe { } fn bar(){}
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt
new file mode 100644
index 000000000..d2da2bad7
--- /dev/null
+++ b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt
@@ -0,0 +1,35 @@
+SOURCE_FILE@[0; 33)
+  FN_DEF@[0; 10)
+    FN_KW@[0; 2)
+    WHITESPACE@[2; 3)
+    NAME@[3; 6)
+      IDENT@[3; 6) "foo"
+    PARAM_LIST@[6; 8)
+      L_PAREN@[6; 7)
+      R_PAREN@[7; 8)
+    BLOCK@[8; 10)
+      L_CURLY@[8; 9)
+      R_CURLY@[9; 10)
+  WHITESPACE@[10; 11)
+  err: `expected an item`
+  ERROR@[11; 17)
+    UNSAFE_KW@[11; 17)
+  WHITESPACE@[17; 18)
+  err: `expected an item`
+  ERROR@[18; 21)
+    L_CURLY@[18; 19)
+    WHITESPACE@[19; 20)
+    R_CURLY@[20; 21)
+  WHITESPACE@[21; 22)
+  FN_DEF@[22; 32)
+    FN_KW@[22; 24)
+    WHITESPACE@[24; 25)
+    NAME@[25; 28)
+      IDENT@[25; 28) "bar"
+    PARAM_LIST@[28; 30)
+      L_PAREN@[28; 29)
+      R_PAREN@[29; 30)
+    BLOCK@[30; 32)
+      L_CURLY@[30; 31)
+      R_CURLY@[31; 32)
+  WHITESPACE@[32; 33)
-- 
cgit v1.2.3