Merge remote-tracking branch 'origin/master'
1 files changed, 7 insertions, 7 deletions
|
|
@@ -1,5 +1,5 @@ |
1 | [email protected] |
1 | [email protected] |
2 | USE_ITEM@0..28 |
2 | [email protected] |
3 | [email protected] "use" |
3 | [email protected] "use" |
4 | [email protected] " " |
4 | [email protected] " " |
5 | [email protected] |
5 | [email protected] |
@@ -13,14 +13,14 @@ [email protected] |
13 | [email protected] |
13 | [email protected] |
14 | [email protected] "path" |
14 | [email protected] "path" |
15 | [email protected] " " |
15 | [email protected] " " |
16 | ALIAS@15..27 |
16 | RENAME@15..27 |
17 | [email protected] "as" |
17 | [email protected] "as" |
18 | [email protected] " " |
18 | [email protected] " " |
19 | [email protected] |
19 | [email protected] |
20 | [email protected] "some_name" |
20 | [email protected] "some_name" |
21 | [email protected] ";" |
21 | [email protected] ";" |
22 | [email protected] "\n" |
22 | [email protected] "\n" |
23 | USE_ITEM@29..181 |
23 | [email protected] |
24 | [email protected] "use" |
24 | [email protected] "use" |
25 | [email protected] " " |
25 | [email protected] " " |
26 | [email protected] |
26 | [email protected] |
@@ -43,7 +43,7 @@ [email protected] |
43 | [email protected] |
43 | [email protected] |
44 | [email protected] "path" |
44 | [email protected] "path" |
45 | [email protected] " " |
45 | [email protected] " " |
46 | ALIAS@54..72 |
46 | RENAME@54..72 |
47 | [email protected] "as" |
47 | [email protected] "as" |
48 | [email protected] " " |
48 | [email protected] " " |
49 | [email protected] |
49 | [email protected] |
@@ -61,7 +61,7 @@ [email protected] |
61 | [email protected] |
61 | [email protected] |
62 | [email protected] "path" |
62 | [email protected] "path" |
63 | [email protected] " " |
63 | [email protected] " " |
64 | ALIAS@91..108 |
64 | RENAME@91..108 |
65 | [email protected] "as" |
65 | [email protected] "as" |
66 | [email protected] " " |
66 | [email protected] " " |
67 | [email protected] |
67 | [email protected] |
@@ -121,7 +121,7 @@ [email protected] |
121 | [email protected] "}" |
121 | [email protected] "}" |
122 | [email protected] ";" |
122 | [email protected] ";" |
123 | [email protected] "\n" |
123 | [email protected] "\n" |
124 | USE_ITEM@182..197 |
124 | [email protected] |
125 | [email protected] "use" |
125 | [email protected] "use" |
126 | [email protected] " " |
126 | [email protected] " " |
127 | [email protected] |
127 | [email protected] |
@@ -130,7 +130,7 @@ [email protected] |
130 | [email protected] |
130 | [email protected] |
131 | [email protected] "Trait" |
131 | [email protected] "Trait" |
132 | [email protected] " " |
132 | [email protected] " " |
133 | ALIAS@192..196 |
133 | RENAME@192..196 |
134 | [email protected] "as" |
134 | [email protected] "as" |
135 | [email protected] " " |
135 | [email protected] " " |
136 | [email protected] "_" |
136 | [email protected] "_" |
|