aboutsummaryrefslogtreecommitdiff
path: root/tests/data/parser
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-02-03 19:44:37 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-02-03 19:44:37 +0000
commit75b59bf519b8dcf1a89327d871dab2c98af61ed9 (patch)
tree6322bf271a4fd5e838098a0f523739fc9a0c9416 /tests/data/parser
parent3c70ae2e26f654ce536f00fde8c159e4ebe6901a (diff)
parentb072e68ad5bf1687aebd2ff1c7bf327d38a6a2f2 (diff)
Merge #39
39: Tools r=matklad a=matklad closes #34 bors r+
Diffstat (limited to 'tests/data/parser')
-rw-r--r--tests/data/parser/inline/0001_const_unsafe_fn.rs1
-rw-r--r--tests/data/parser/inline/0001_const_unsafe_fn.txt15
-rw-r--r--tests/data/parser/inline/0002_const_fn.rs1
-rw-r--r--tests/data/parser/inline/0002_const_fn.txt13
-rw-r--r--tests/data/parser/ok/0024_const_fn.rs5
-rw-r--r--tests/data/parser/ok/0024_const_fn.txt29
-rw-r--r--tests/data/parser/ok/0024_const_item.rs (renamed from tests/data/parser/ok/0025_const_item.rs)0
-rw-r--r--tests/data/parser/ok/0024_const_item.txt (renamed from tests/data/parser/ok/0025_const_item.txt)0
8 files changed, 30 insertions, 34 deletions
diff --git a/tests/data/parser/inline/0001_const_unsafe_fn.rs b/tests/data/parser/inline/0001_const_unsafe_fn.rs
new file mode 100644
index 000000000..31a1e435f
--- /dev/null
+++ b/tests/data/parser/inline/0001_const_unsafe_fn.rs
@@ -0,0 +1 @@
const unsafe fn foo() {}
diff --git a/tests/data/parser/inline/0001_const_unsafe_fn.txt b/tests/data/parser/inline/0001_const_unsafe_fn.txt
new file mode 100644
index 000000000..1f0865cb0
--- /dev/null
+++ b/tests/data/parser/inline/0001_const_unsafe_fn.txt
@@ -0,0 +1,15 @@
1FILE@[0; 25)
2 FN_ITEM@[0; 25)
3 CONST_KW@[0; 5)
4 WHITESPACE@[5; 6)
5 UNSAFE_KW@[6; 12)
6 WHITESPACE@[12; 13)
7 FN_KW@[13; 15)
8 WHITESPACE@[15; 16)
9 IDENT@[16; 19) "foo"
10 L_PAREN@[19; 20)
11 R_PAREN@[20; 21)
12 WHITESPACE@[21; 22)
13 L_CURLY@[22; 23)
14 R_CURLY@[23; 24)
15 WHITESPACE@[24; 25)
diff --git a/tests/data/parser/inline/0002_const_fn.rs b/tests/data/parser/inline/0002_const_fn.rs
new file mode 100644
index 000000000..8c84d9cd7
--- /dev/null
+++ b/tests/data/parser/inline/0002_const_fn.rs
@@ -0,0 +1 @@
const fn foo() {}
diff --git a/tests/data/parser/inline/0002_const_fn.txt b/tests/data/parser/inline/0002_const_fn.txt
new file mode 100644
index 000000000..2d360d78b
--- /dev/null
+++ b/tests/data/parser/inline/0002_const_fn.txt
@@ -0,0 +1,13 @@
1FILE@[0; 18)
2 FN_ITEM@[0; 18)
3 CONST_KW@[0; 5)
4 WHITESPACE@[5; 6)
5 FN_KW@[6; 8)
6 WHITESPACE@[8; 9)
7 IDENT@[9; 12) "foo"
8 L_PAREN@[12; 13)
9 R_PAREN@[13; 14)
10 WHITESPACE@[14; 15)
11 L_CURLY@[15; 16)
12 R_CURLY@[16; 17)
13 WHITESPACE@[17; 18)
diff --git a/tests/data/parser/ok/0024_const_fn.rs b/tests/data/parser/ok/0024_const_fn.rs
deleted file mode 100644
index eba9322a1..000000000
--- a/tests/data/parser/ok/0024_const_fn.rs
+++ /dev/null
@@ -1,5 +0,0 @@
1const fn foo() {
2}
3
4const unsafe fn foo() {
5}
diff --git a/tests/data/parser/ok/0024_const_fn.txt b/tests/data/parser/ok/0024_const_fn.txt
deleted file mode 100644
index 0fd485997..000000000
--- a/tests/data/parser/ok/0024_const_fn.txt
+++ /dev/null
@@ -1,29 +0,0 @@
1FILE@[0; 46)
2 FN_ITEM@[0; 20)
3 CONST_KW@[0; 5)
4 WHITESPACE@[5; 6)
5 FN_KW@[6; 8)
6 WHITESPACE@[8; 9)
7 IDENT@[9; 12) "foo"
8 L_PAREN@[12; 13)
9 R_PAREN@[13; 14)
10 WHITESPACE@[14; 15)
11 L_CURLY@[15; 16)
12 WHITESPACE@[16; 17)
13 R_CURLY@[17; 18)
14 WHITESPACE@[18; 20)
15 FN_ITEM@[20; 46)
16 CONST_KW@[20; 25)
17 WHITESPACE@[25; 26)
18 UNSAFE_KW@[26; 32)
19 WHITESPACE@[32; 33)
20 FN_KW@[33; 35)
21 WHITESPACE@[35; 36)
22 IDENT@[36; 39) "foo"
23 L_PAREN@[39; 40)
24 R_PAREN@[40; 41)
25 WHITESPACE@[41; 42)
26 L_CURLY@[42; 43)
27 WHITESPACE@[43; 44)
28 R_CURLY@[44; 45)
29 WHITESPACE@[45; 46)
diff --git a/tests/data/parser/ok/0025_const_item.rs b/tests/data/parser/ok/0024_const_item.rs
index 7446859b5..7446859b5 100644
--- a/tests/data/parser/ok/0025_const_item.rs
+++ b/tests/data/parser/ok/0024_const_item.rs
diff --git a/tests/data/parser/ok/0025_const_item.txt b/tests/data/parser/ok/0024_const_item.txt
index 588e001f5..588e001f5 100644
--- a/tests/data/parser/ok/0025_const_item.txt
+++ b/tests/data/parser/ok/0024_const_item.txt