@@ -28,97 +28,68 @@ error: unresolved link to `std::io::not::here`
28
28
LL | /// [std::io::not::here]
29
29
| ^^^^^^^^^^^^^^^^^^ the module `io` contains no item named `not`
30
30
31
- <<<<<<< HEAD
32
31
error: unresolved link to `std::io::not::here`
33
- --> $DIR/intra-link-errors.rs:23:6
34
- =======
35
- error: unresolved link to `std::io::Error::x`
36
32
--> $DIR/intra-link-errors.rs:24:6
37
- >>>>>>> Add `unclosed_html_tags` lint
38
33
|
39
34
LL | /// [type@std::io::not::here]
40
35
| ^^^^^^^^^^^^^^^^^^^^^^^ the module `io` contains no item named `not`
41
36
42
37
error: unresolved link to `std::io::Error::x`
43
- --> $DIR/intra-link-errors.rs:27 :6
38
+ --> $DIR/intra-link-errors.rs:28 :6
44
39
|
45
40
LL | /// [std::io::Error::x]
46
41
| ^^^^^^^^^^^^^^^^^ the struct `Error` has no field or associated item named `x`
47
42
48
43
error: unresolved link to `std::io::ErrorKind::x`
49
- <<<<<<< HEAD
50
- --> $DIR/intra-link-errors.rs:31:6
51
- =======
52
- --> $DIR/intra-link-errors.rs:28:6
53
- >>>>>>> Add `unclosed_html_tags` lint
44
+ --> $DIR/intra-link-errors.rs:32:6
54
45
|
55
46
LL | /// [std::io::ErrorKind::x]
56
47
| ^^^^^^^^^^^^^^^^^^^^^ the enum `ErrorKind` has no variant or associated item named `x`
57
48
58
49
error: unresolved link to `f::A`
59
- <<<<<<< HEAD
60
- --> $DIR/intra-link-errors.rs:35:6
61
- =======
62
- --> $DIR/intra-link-errors.rs:32:6
63
- >>>>>>> Add `unclosed_html_tags` lint
50
+ --> $DIR/intra-link-errors.rs:36:6
64
51
|
65
52
LL | /// [f::A]
66
53
| ^^^^ `f` is a function, not a module or type, and cannot have associated items
67
54
68
55
error: unresolved link to `f::A`
69
- --> $DIR/intra-link-errors.rs:39 :6
56
+ --> $DIR/intra-link-errors.rs:40 :6
70
57
|
71
58
LL | /// [f::A!]
72
59
| ^^^^^ `f` is a function, not a module or type, and cannot have associated items
73
60
74
61
error: unresolved link to `S::A`
75
- <<<<<<< HEAD
76
- --> $DIR/intra-link-errors.rs:43:6
77
- =======
78
- --> $DIR/intra-link-errors.rs:36:6
79
- >>>>>>> Add `unclosed_html_tags` lint
62
+ --> $DIR/intra-link-errors.rs:44:6
80
63
|
81
64
LL | /// [S::A]
82
65
| ^^^^ the struct `S` has no field or associated item named `A`
83
66
84
67
error: unresolved link to `S::fmt`
85
- <<<<<<< HEAD
86
- --> $DIR/intra-link-errors.rs:47:6
87
- =======
88
- --> $DIR/intra-link-errors.rs:40:6
89
- >>>>>>> Add `unclosed_html_tags` lint
68
+ --> $DIR/intra-link-errors.rs:48:6
90
69
|
91
70
LL | /// [S::fmt]
92
71
| ^^^^^^ the struct `S` has no field or associated item named `fmt`
93
72
94
73
error: unresolved link to `E::D`
95
- <<<<<<< HEAD
96
- --> $DIR/intra-link-errors.rs:51:6
97
- =======
98
- --> $DIR/intra-link-errors.rs:44:6
99
- >>>>>>> Add `unclosed_html_tags` lint
74
+ --> $DIR/intra-link-errors.rs:52:6
100
75
|
101
76
LL | /// [E::D]
102
77
| ^^^^ the enum `E` has no variant or associated item named `D`
103
78
104
79
error: unresolved link to `u8::not_found`
105
- <<<<<<< HEAD
106
- --> $DIR/intra-link-errors.rs:55:6
107
- =======
108
- --> $DIR/intra-link-errors.rs:48:6
109
- >>>>>>> Add `unclosed_html_tags` lint
80
+ --> $DIR/intra-link-errors.rs:56:6
110
81
|
111
82
LL | /// [u8::not_found]
112
83
| ^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
113
84
114
85
error: unresolved link to `std::primitive::u8::not_found`
115
- --> $DIR/intra-link-errors.rs:59 :6
86
+ --> $DIR/intra-link-errors.rs:60 :6
116
87
|
117
88
LL | /// [std::primitive::u8::not_found]
118
89
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the builtin type `u8` has no associated item named `not_found`
119
90
120
91
error: unresolved link to `Vec::into_iter`
121
- --> $DIR/intra-link-errors.rs:63 :6
92
+ --> $DIR/intra-link-errors.rs:64 :6
122
93
|
123
94
LL | /// [type@Vec::into_iter]
124
95
| ^^^^^^^^^^^^^^^^^^^
@@ -127,11 +98,7 @@ LL | /// [type@Vec::into_iter]
127
98
| help: to link to the associated function, add parentheses: `Vec::into_iter()`
128
99
129
100
error: unresolved link to `S`
130
- <<<<<<< HEAD
131
- --> $DIR/intra-link-errors.rs:68:6
132
- =======
133
- --> $DIR/intra-link-errors.rs:52:6
134
- >>>>>>> Add `unclosed_html_tags` lint
101
+ --> $DIR/intra-link-errors.rs:69:6
135
102
|
136
103
LL | /// [S!]
137
104
| ^^
@@ -140,11 +107,7 @@ LL | /// [S!]
140
107
| help: to link to the struct, prefix with `struct@`: `struct@S`
141
108
142
109
error: unresolved link to `T::g`
143
- <<<<<<< HEAD
144
- --> $DIR/intra-link-errors.rs:86:6
145
- =======
146
- --> $DIR/intra-link-errors.rs:70:6
147
- >>>>>>> Add `unclosed_html_tags` lint
110
+ --> $DIR/intra-link-errors.rs:87:6
148
111
|
149
112
LL | /// [type@T::g]
150
113
| ^^^^^^^^^
@@ -153,21 +116,13 @@ LL | /// [type@T::g]
153
116
| help: to link to the associated function, add parentheses: `T::g()`
154
117
155
118
error: unresolved link to `T::h`
156
- <<<<<<< HEAD
157
- --> $DIR/intra-link-errors.rs:91:6
158
- =======
159
- --> $DIR/intra-link-errors.rs:75:6
160
- >>>>>>> Add `unclosed_html_tags` lint
119
+ --> $DIR/intra-link-errors.rs:92:6
161
120
|
162
121
LL | /// [T::h!]
163
122
| ^^^^^ the trait `T` has no macro named `h`
164
123
165
124
error: unresolved link to `S::h`
166
- <<<<<<< HEAD
167
- --> $DIR/intra-link-errors.rs:78:6
168
- =======
169
- --> $DIR/intra-link-errors.rs:62:6
170
- >>>>>>> Add `unclosed_html_tags` lint
125
+ --> $DIR/intra-link-errors.rs:79:6
171
126
|
172
127
LL | /// [type@S::h]
173
128
| ^^^^^^^^^
@@ -176,11 +131,7 @@ LL | /// [type@S::h]
176
131
| help: to link to the associated function, add parentheses: `S::h()`
177
132
178
133
error: unresolved link to `m`
179
- <<<<<<< HEAD
180
- --> $DIR/intra-link-errors.rs:98:6
181
- =======
182
- --> $DIR/intra-link-errors.rs:82:6
183
- >>>>>>> Add `unclosed_html_tags` lint
134
+ --> $DIR/intra-link-errors.rs:99:6
184
135
|
185
136
LL | /// [m()]
186
137
| ^^^
0 commit comments