Skip to content

Commit eea4311

Browse files
matkladmatklad
committed
Regenerate
1 parent d308ff9 commit eea4311

File tree

5 files changed

+44
-42
lines changed

5 files changed

+44
-42
lines changed

‎crates/ra_assists/src/tests.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
mod generated;
2+
13
use std::sync::Arc;
24

35
use hir::Semantics;

‎crates/ra_assists/src/tests/generated.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
//! Generated file, do not edit by hand, see `xtask/src/codegen`
22
3-
use super::check;
3+
use super::check_doc_test;
44

55
#[test]
66
fn doctest_add_custom_impl() {
7-
check(
7+
check_doc_test(
88
"add_custom_impl",
99
r#####"
1010
#[derive(Deb<|>ug, Display)]
@@ -23,7 +23,7 @@ impl Debug for S {
2323

2424
#[test]
2525
fn doctest_add_derive() {
26-
check(
26+
check_doc_test(
2727
"add_derive",
2828
r#####"
2929
struct Point {
@@ -43,7 +43,7 @@ struct Point {
4343

4444
#[test]
4545
fn doctest_add_explicit_type() {
46-
check(
46+
check_doc_test(
4747
"add_explicit_type",
4848
r#####"
4949
fn main() {
@@ -60,7 +60,7 @@ fn main() {
6060

6161
#[test]
6262
fn doctest_add_function() {
63-
check(
63+
check_doc_test(
6464
"add_function",
6565
r#####"
6666
struct Baz;
@@ -87,7 +87,7 @@ fn bar(arg: &str, baz: Baz) {
8787

8888
#[test]
8989
fn doctest_add_hash() {
90-
check(
90+
check_doc_test(
9191
"add_hash",
9292
r#####"
9393
fn main() {
@@ -104,7 +104,7 @@ fn main() {
104104

105105
#[test]
106106
fn doctest_add_impl() {
107-
check(
107+
check_doc_test(
108108
"add_impl",
109109
r#####"
110110
struct Ctx<T: Clone> {
@@ -125,7 +125,7 @@ impl<T: Clone> Ctx<T> {
125125

126126
#[test]
127127
fn doctest_add_impl_default_members() {
128-
check(
128+
check_doc_test(
129129
"add_impl_default_members",
130130
r#####"
131131
trait Trait {
@@ -159,7 +159,7 @@ impl Trait for () {
159159

160160
#[test]
161161
fn doctest_add_impl_missing_members() {
162-
check(
162+
check_doc_test(
163163
"add_impl_missing_members",
164164
r#####"
165165
trait Trait<T> {
@@ -191,7 +191,7 @@ impl Trait<u32> for () {
191191

192192
#[test]
193193
fn doctest_add_new() {
194-
check(
194+
check_doc_test(
195195
"add_new",
196196
r#####"
197197
struct Ctx<T: Clone> {
@@ -213,7 +213,7 @@ impl<T: Clone> Ctx<T> {
213213

214214
#[test]
215215
fn doctest_apply_demorgan() {
216-
check(
216+
check_doc_test(
217217
"apply_demorgan",
218218
r#####"
219219
fn main() {
@@ -230,7 +230,7 @@ fn main() {
230230

231231
#[test]
232232
fn doctest_auto_import() {
233-
check(
233+
check_doc_test(
234234
"auto_import",
235235
r#####"
236236
fn main() {
@@ -251,7 +251,7 @@ pub mod std { pub mod collections { pub struct HashMap { } } }
251251

252252
#[test]
253253
fn doctest_change_visibility() {
254-
check(
254+
check_doc_test(
255255
"change_visibility",
256256
r#####"
257257
<|>fn frobnicate() {}
@@ -264,7 +264,7 @@ pub(crate) fn frobnicate() {}
264264

265265
#[test]
266266
fn doctest_convert_to_guarded_return() {
267-
check(
267+
check_doc_test(
268268
"convert_to_guarded_return",
269269
r#####"
270270
fn main() {
@@ -288,7 +288,7 @@ fn main() {
288288

289289
#[test]
290290
fn doctest_fill_match_arms() {
291-
check(
291+
check_doc_test(
292292
"fill_match_arms",
293293
r#####"
294294
enum Action { Move { distance: u32 }, Stop }
@@ -314,7 +314,7 @@ fn handle(action: Action) {
314314

315315
#[test]
316316
fn doctest_flip_binexpr() {
317-
check(
317+
check_doc_test(
318318
"flip_binexpr",
319319
r#####"
320320
fn main() {
@@ -331,7 +331,7 @@ fn main() {
331331

332332
#[test]
333333
fn doctest_flip_comma() {
334-
check(
334+
check_doc_test(
335335
"flip_comma",
336336
r#####"
337337
fn main() {
@@ -348,7 +348,7 @@ fn main() {
348348

349349
#[test]
350350
fn doctest_flip_trait_bound() {
351-
check(
351+
check_doc_test(
352352
"flip_trait_bound",
353353
r#####"
354354
fn foo<T: Clone +<|> Copy>() { }
@@ -361,7 +361,7 @@ fn foo<T: Copy + Clone>() { }
361361

362362
#[test]
363363
fn doctest_inline_local_variable() {
364-
check(
364+
check_doc_test(
365365
"inline_local_variable",
366366
r#####"
367367
fn main() {
@@ -379,7 +379,7 @@ fn main() {
379379

380380
#[test]
381381
fn doctest_introduce_variable() {
382-
check(
382+
check_doc_test(
383383
"introduce_variable",
384384
r#####"
385385
fn main() {
@@ -397,7 +397,7 @@ fn main() {
397397

398398
#[test]
399399
fn doctest_invert_if() {
400-
check(
400+
check_doc_test(
401401
"invert_if",
402402
r#####"
403403
fn main() {
@@ -414,7 +414,7 @@ fn main() {
414414

415415
#[test]
416416
fn doctest_make_raw_string() {
417-
check(
417+
check_doc_test(
418418
"make_raw_string",
419419
r#####"
420420
fn main() {
@@ -431,7 +431,7 @@ fn main() {
431431

432432
#[test]
433433
fn doctest_make_usual_string() {
434-
check(
434+
check_doc_test(
435435
"make_usual_string",
436436
r#####"
437437
fn main() {
@@ -448,7 +448,7 @@ fn main() {
448448

449449
#[test]
450450
fn doctest_merge_imports() {
451-
check(
451+
check_doc_test(
452452
"merge_imports",
453453
r#####"
454454
use std::<|>fmt::Formatter;
@@ -462,7 +462,7 @@ use std::{fmt::Formatter, io};
462462

463463
#[test]
464464
fn doctest_merge_match_arms() {
465-
check(
465+
check_doc_test(
466466
"merge_match_arms",
467467
r#####"
468468
enum Action { Move { distance: u32 }, Stop }
@@ -488,7 +488,7 @@ fn handle(action: Action) {
488488

489489
#[test]
490490
fn doctest_move_arm_cond_to_match_guard() {
491-
check(
491+
check_doc_test(
492492
"move_arm_cond_to_match_guard",
493493
r#####"
494494
enum Action { Move { distance: u32 }, Stop }
@@ -515,7 +515,7 @@ fn handle(action: Action) {
515515

516516
#[test]
517517
fn doctest_move_bounds_to_where_clause() {
518-
check(
518+
check_doc_test(
519519
"move_bounds_to_where_clause",
520520
r#####"
521521
fn apply<T, U, <|>F: FnOnce(T) -> U>(f: F, x: T) -> U {
@@ -532,7 +532,7 @@ fn apply<T, U, F>(f: F, x: T) -> U where F: FnOnce(T) -> U {
532532

533533
#[test]
534534
fn doctest_move_guard_to_arm_body() {
535-
check(
535+
check_doc_test(
536536
"move_guard_to_arm_body",
537537
r#####"
538538
enum Action { Move { distance: u32 }, Stop }
@@ -559,7 +559,7 @@ fn handle(action: Action) {
559559

560560
#[test]
561561
fn doctest_remove_dbg() {
562-
check(
562+
check_doc_test(
563563
"remove_dbg",
564564
r#####"
565565
fn main() {
@@ -576,7 +576,7 @@ fn main() {
576576

577577
#[test]
578578
fn doctest_remove_hash() {
579-
check(
579+
check_doc_test(
580580
"remove_hash",
581581
r#####"
582582
fn main() {
@@ -593,7 +593,7 @@ fn main() {
593593

594594
#[test]
595595
fn doctest_remove_mut() {
596-
check(
596+
check_doc_test(
597597
"remove_mut",
598598
r#####"
599599
impl Walrus {
@@ -610,7 +610,7 @@ impl Walrus {
610610

611611
#[test]
612612
fn doctest_reorder_fields() {
613-
check(
613+
check_doc_test(
614614
"reorder_fields",
615615
r#####"
616616
struct Foo {foo: i32, bar: i32};
@@ -625,7 +625,7 @@ const test: Foo = Foo {foo: 1, bar: 0}
625625

626626
#[test]
627627
fn doctest_replace_if_let_with_match() {
628-
check(
628+
check_doc_test(
629629
"replace_if_let_with_match",
630630
r#####"
631631
enum Action { Move { distance: u32 }, Stop }
@@ -653,7 +653,7 @@ fn handle(action: Action) {
653653

654654
#[test]
655655
fn doctest_replace_let_with_if_let() {
656-
check(
656+
check_doc_test(
657657
"replace_let_with_if_let",
658658
r#####"
659659
enum Option<T> { Some(T), None }
@@ -679,7 +679,7 @@ fn compute() -> Option<i32> { None }
679679

680680
#[test]
681681
fn doctest_replace_qualified_name_with_use() {
682-
check(
682+
check_doc_test(
683683
"replace_qualified_name_with_use",
684684
r#####"
685685
fn process(map: std::collections::<|>HashMap<String, String>) {}
@@ -694,7 +694,7 @@ fn process(map: HashMap<String, String>) {}
694694

695695
#[test]
696696
fn doctest_replace_unwrap_with_match() {
697-
check(
697+
check_doc_test(
698698
"replace_unwrap_with_match",
699699
r#####"
700700
enum Result<T, E> { Ok(T), Err(E) }
@@ -718,7 +718,7 @@ fn main() {
718718

719719
#[test]
720720
fn doctest_split_import() {
721-
check(
721+
check_doc_test(
722722
"split_import",
723723
r#####"
724724
use std::<|>collections::HashMap;
@@ -731,7 +731,7 @@ use std::{collections::HashMap};
731731

732732
#[test]
733733
fn doctest_unwrap_block() {
734-
check(
734+
check_doc_test(
735735
"unwrap_block",
736736
r#####"
737737
fn foo() {

‎xtask/src/codegen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs";
2727
const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs";
2828

2929
const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers";
30-
const ASSISTS_TESTS: &str = "crates/ra_assists/src/doc_tests/generated.rs";
30+
const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs";
3131
const ASSISTS_DOCS: &str = "docs/user/assists.md";
3232

3333
#[derive(Debug, PartialEq, Eq, Clone, Copy)]

‎xtask/src/codegen/gen_assists_docs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ fn collect_assists() -> Result<Vec<Assist>> {
101101
}
102102

103103
fn generate_tests(assists: &[Assist], mode: Mode) -> Result<()> {
104-
let mut buf = String::from("use super::check;\n");
104+
let mut buf = String::from("use super::check_doc_test;\n");
105105

106106
for assist in assists.iter() {
107107
let test = format!(
108108
r######"
109109
#[test]
110110
fn doctest_{}() {{
111-
check(
111+
check_doc_test(
112112
"{}",
113113
r#####"
114114
{}"#####, r#####"

‎xtask/tests/tidy-tests/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn check_todo(path: &Path, text: &str) {
2424
// This file itself is whitelisted since this test itself contains matches.
2525
"tests/cli.rs",
2626
// Some of our assists generate `todo!()` so those files are whitelisted.
27-
"doc_tests/generated.rs",
27+
"tests/generated.rs",
2828
"handlers/add_missing_impl_members.rs",
2929
"handlers/add_function.rs",
3030
// To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.

0 commit comments

Comments
 (0)