Skip to content

Commit fd4a33c

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update doctest tests
1 parent 32d64ed commit fd4a33c

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎src/librustdoc/doctest/tests.rs

+34-34
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ fn main() {
1111
assert_eq!(2+2, 4);
1212
}"
1313
.to_string();
14-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
15-
assert_eq!(output, (expected, 2));
14+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
15+
assert_eq!((output, len), (expected, 2));
1616
}
1717

1818
#[test]
@@ -26,8 +26,8 @@ fn main() {
2626
assert_eq!(2+2, 4);
2727
}"
2828
.to_string();
29-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
30-
assert_eq!(output, (expected, 2));
29+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
30+
assert_eq!((output, len), (expected, 2));
3131
}
3232

3333
#[test]
@@ -44,8 +44,8 @@ use asdf::qwop;
4444
assert_eq!(2+2, 4);
4545
}"
4646
.to_string();
47-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
48-
assert_eq!(output, (expected, 3));
47+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
48+
assert_eq!((output, len), (expected, 3));
4949
}
5050

5151
#[test]
@@ -61,8 +61,8 @@ use asdf::qwop;
6161
assert_eq!(2+2, 4);
6262
}"
6363
.to_string();
64-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
65-
assert_eq!(output, (expected, 2));
64+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
65+
assert_eq!((output, len), (expected, 2));
6666
}
6767

6868
#[test]
@@ -79,8 +79,8 @@ use std::*;
7979
assert_eq!(2+2, 4);
8080
}"
8181
.to_string();
82-
let output = make_test(input, Some("std"), false, &opts, DEFAULT_EDITION);
83-
assert_eq!(output, (expected, 2));
82+
let (output, len, _) = make_test(input, Some("std"), false, &opts, DEFAULT_EDITION);
83+
assert_eq!((output, len), (expected, 2));
8484
}
8585

8686
#[test]
@@ -98,8 +98,8 @@ use asdf::qwop;
9898
assert_eq!(2+2, 4);
9999
}"
100100
.to_string();
101-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
102-
assert_eq!(output, (expected, 2));
101+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
102+
assert_eq!((output, len), (expected, 2));
103103
}
104104

105105
#[test]
@@ -115,8 +115,8 @@ use asdf::qwop;
115115
assert_eq!(2+2, 4);
116116
}"
117117
.to_string();
118-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
119-
assert_eq!(output, (expected, 2));
118+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
119+
assert_eq!((output, len), (expected, 2));
120120
}
121121

122122
#[test]
@@ -134,8 +134,8 @@ use asdf::qwop;
134134
assert_eq!(2+2, 4);
135135
}"
136136
.to_string();
137-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
138-
assert_eq!(output, (expected, 3));
137+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
138+
assert_eq!((output, len), (expected, 3));
139139

140140
// Adding more will also bump the returned line offset.
141141
opts.attrs.push("feature(hella_dope)".to_string());
@@ -147,8 +147,8 @@ use asdf::qwop;
147147
assert_eq!(2+2, 4);
148148
}"
149149
.to_string();
150-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
151-
assert_eq!(output, (expected, 4));
150+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
151+
assert_eq!((output, len), (expected, 4));
152152
}
153153

154154
#[test]
@@ -164,8 +164,8 @@ fn main() {
164164
assert_eq!(2+2, 4);
165165
}"
166166
.to_string();
167-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
168-
assert_eq!(output, (expected, 2));
167+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
168+
assert_eq!((output, len), (expected, 2));
169169
}
170170

171171
#[test]
@@ -180,8 +180,8 @@ fn main() {
180180
assert_eq!(2+2, 4);
181181
}"
182182
.to_string();
183-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
184-
assert_eq!(output, (expected, 1));
183+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
184+
assert_eq!((output, len), (expected, 1));
185185
}
186186

187187
#[test]
@@ -196,8 +196,8 @@ fn main() {
196196
assert_eq!(2+2, 4);
197197
}"
198198
.to_string();
199-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
200-
assert_eq!(output, (expected, 2));
199+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
200+
assert_eq!((output, len), (expected, 2));
201201
}
202202

203203
#[test]
@@ -210,8 +210,8 @@ assert_eq!(2+2, 4);";
210210
//Ceci n'est pas une `fn main`
211211
assert_eq!(2+2, 4);"
212212
.to_string();
213-
let output = make_test(input, None, true, &opts, DEFAULT_EDITION);
214-
assert_eq!(output, (expected, 1));
213+
let (output, len, _) = make_test(input, None, true, &opts, DEFAULT_EDITION);
214+
assert_eq!((output, len), (expected, 1));
215215
}
216216

217217
#[test]
@@ -224,8 +224,8 @@ fn make_test_display_warnings() {
224224
assert_eq!(2+2, 4);
225225
}"
226226
.to_string();
227-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
228-
assert_eq!(output, (expected, 1));
227+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
228+
assert_eq!((output, len), (expected, 1));
229229
}
230230

231231
#[test]
@@ -242,8 +242,8 @@ assert_eq!(2+2, 4);
242242
}"
243243
.to_string();
244244

245-
let output = make_test(input, None, false, &opts, DEFAULT_EDITION);
246-
assert_eq!(output, (expected, 2));
245+
let (output, len, _) = make_test(input, None, false, &opts, DEFAULT_EDITION);
246+
assert_eq!((output, len), (expected, 2));
247247

248248
let input = "extern crate hella_qwop;
249249
assert_eq!(asdf::foo, 4);";
@@ -256,8 +256,8 @@ assert_eq!(asdf::foo, 4);
256256
}"
257257
.to_string();
258258

259-
let output = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
260-
assert_eq!(output, (expected, 3));
259+
let (output, len, _) = make_test(input, Some("asdf"), false, &opts, DEFAULT_EDITION);
260+
assert_eq!((output, len), (expected, 3));
261261
}
262262

263263
#[test]
@@ -274,6 +274,6 @@ test_wrapper! {
274274
}"
275275
.to_string();
276276

277-
let output = make_test(input, Some("my_crate"), false, &opts, DEFAULT_EDITION);
278-
assert_eq!(output, (expected, 1));
277+
let (output, len, _) = make_test(input, Some("my_crate"), false, &opts, DEFAULT_EDITION);
278+
assert_eq!((output, len), (expected, 1));
279279
}

0 commit comments

Comments
 (0)