Regenerate

This commit is contained in:
Aleksey Kladov 2020-05-06 10:21:35 +02:00
parent d308ff910b
commit eea431180e
5 changed files with 44 additions and 42 deletions

View file

@ -1,3 +1,5 @@
mod generated;
use std::sync::Arc; use std::sync::Arc;
use hir::Semantics; use hir::Semantics;

View file

@ -1,10 +1,10 @@
//! Generated file, do not edit by hand, see `xtask/src/codegen` //! Generated file, do not edit by hand, see `xtask/src/codegen`
use super::check; use super::check_doc_test;
#[test] #[test]
fn doctest_add_custom_impl() { fn doctest_add_custom_impl() {
check( check_doc_test(
"add_custom_impl", "add_custom_impl",
r#####" r#####"
#[derive(Deb<|>ug, Display)] #[derive(Deb<|>ug, Display)]
@ -23,7 +23,7 @@ impl Debug for S {
#[test] #[test]
fn doctest_add_derive() { fn doctest_add_derive() {
check( check_doc_test(
"add_derive", "add_derive",
r#####" r#####"
struct Point { struct Point {
@ -43,7 +43,7 @@ struct Point {
#[test] #[test]
fn doctest_add_explicit_type() { fn doctest_add_explicit_type() {
check( check_doc_test(
"add_explicit_type", "add_explicit_type",
r#####" r#####"
fn main() { fn main() {
@ -60,7 +60,7 @@ fn main() {
#[test] #[test]
fn doctest_add_function() { fn doctest_add_function() {
check( check_doc_test(
"add_function", "add_function",
r#####" r#####"
struct Baz; struct Baz;
@ -87,7 +87,7 @@ fn bar(arg: &str, baz: Baz) {
#[test] #[test]
fn doctest_add_hash() { fn doctest_add_hash() {
check( check_doc_test(
"add_hash", "add_hash",
r#####" r#####"
fn main() { fn main() {
@ -104,7 +104,7 @@ fn main() {
#[test] #[test]
fn doctest_add_impl() { fn doctest_add_impl() {
check( check_doc_test(
"add_impl", "add_impl",
r#####" r#####"
struct Ctx<T: Clone> { struct Ctx<T: Clone> {
@ -125,7 +125,7 @@ impl<T: Clone> Ctx<T> {
#[test] #[test]
fn doctest_add_impl_default_members() { fn doctest_add_impl_default_members() {
check( check_doc_test(
"add_impl_default_members", "add_impl_default_members",
r#####" r#####"
trait Trait { trait Trait {
@ -159,7 +159,7 @@ impl Trait for () {
#[test] #[test]
fn doctest_add_impl_missing_members() { fn doctest_add_impl_missing_members() {
check( check_doc_test(
"add_impl_missing_members", "add_impl_missing_members",
r#####" r#####"
trait Trait<T> { trait Trait<T> {
@ -191,7 +191,7 @@ impl Trait<u32> for () {
#[test] #[test]
fn doctest_add_new() { fn doctest_add_new() {
check( check_doc_test(
"add_new", "add_new",
r#####" r#####"
struct Ctx<T: Clone> { struct Ctx<T: Clone> {
@ -213,7 +213,7 @@ impl<T: Clone> Ctx<T> {
#[test] #[test]
fn doctest_apply_demorgan() { fn doctest_apply_demorgan() {
check( check_doc_test(
"apply_demorgan", "apply_demorgan",
r#####" r#####"
fn main() { fn main() {
@ -230,7 +230,7 @@ fn main() {
#[test] #[test]
fn doctest_auto_import() { fn doctest_auto_import() {
check( check_doc_test(
"auto_import", "auto_import",
r#####" r#####"
fn main() { fn main() {
@ -251,7 +251,7 @@ pub mod std { pub mod collections { pub struct HashMap { } } }
#[test] #[test]
fn doctest_change_visibility() { fn doctest_change_visibility() {
check( check_doc_test(
"change_visibility", "change_visibility",
r#####" r#####"
<|>fn frobnicate() {} <|>fn frobnicate() {}
@ -264,7 +264,7 @@ pub(crate) fn frobnicate() {}
#[test] #[test]
fn doctest_convert_to_guarded_return() { fn doctest_convert_to_guarded_return() {
check( check_doc_test(
"convert_to_guarded_return", "convert_to_guarded_return",
r#####" r#####"
fn main() { fn main() {
@ -288,7 +288,7 @@ fn main() {
#[test] #[test]
fn doctest_fill_match_arms() { fn doctest_fill_match_arms() {
check( check_doc_test(
"fill_match_arms", "fill_match_arms",
r#####" r#####"
enum Action { Move { distance: u32 }, Stop } enum Action { Move { distance: u32 }, Stop }
@ -314,7 +314,7 @@ fn handle(action: Action) {
#[test] #[test]
fn doctest_flip_binexpr() { fn doctest_flip_binexpr() {
check( check_doc_test(
"flip_binexpr", "flip_binexpr",
r#####" r#####"
fn main() { fn main() {
@ -331,7 +331,7 @@ fn main() {
#[test] #[test]
fn doctest_flip_comma() { fn doctest_flip_comma() {
check( check_doc_test(
"flip_comma", "flip_comma",
r#####" r#####"
fn main() { fn main() {
@ -348,7 +348,7 @@ fn main() {
#[test] #[test]
fn doctest_flip_trait_bound() { fn doctest_flip_trait_bound() {
check( check_doc_test(
"flip_trait_bound", "flip_trait_bound",
r#####" r#####"
fn foo<T: Clone +<|> Copy>() { } fn foo<T: Clone +<|> Copy>() { }
@ -361,7 +361,7 @@ fn foo<T: Copy + Clone>() { }
#[test] #[test]
fn doctest_inline_local_variable() { fn doctest_inline_local_variable() {
check( check_doc_test(
"inline_local_variable", "inline_local_variable",
r#####" r#####"
fn main() { fn main() {
@ -379,7 +379,7 @@ fn main() {
#[test] #[test]
fn doctest_introduce_variable() { fn doctest_introduce_variable() {
check( check_doc_test(
"introduce_variable", "introduce_variable",
r#####" r#####"
fn main() { fn main() {
@ -397,7 +397,7 @@ fn main() {
#[test] #[test]
fn doctest_invert_if() { fn doctest_invert_if() {
check( check_doc_test(
"invert_if", "invert_if",
r#####" r#####"
fn main() { fn main() {
@ -414,7 +414,7 @@ fn main() {
#[test] #[test]
fn doctest_make_raw_string() { fn doctest_make_raw_string() {
check( check_doc_test(
"make_raw_string", "make_raw_string",
r#####" r#####"
fn main() { fn main() {
@ -431,7 +431,7 @@ fn main() {
#[test] #[test]
fn doctest_make_usual_string() { fn doctest_make_usual_string() {
check( check_doc_test(
"make_usual_string", "make_usual_string",
r#####" r#####"
fn main() { fn main() {
@ -448,7 +448,7 @@ fn main() {
#[test] #[test]
fn doctest_merge_imports() { fn doctest_merge_imports() {
check( check_doc_test(
"merge_imports", "merge_imports",
r#####" r#####"
use std::<|>fmt::Formatter; use std::<|>fmt::Formatter;
@ -462,7 +462,7 @@ use std::{fmt::Formatter, io};
#[test] #[test]
fn doctest_merge_match_arms() { fn doctest_merge_match_arms() {
check( check_doc_test(
"merge_match_arms", "merge_match_arms",
r#####" r#####"
enum Action { Move { distance: u32 }, Stop } enum Action { Move { distance: u32 }, Stop }
@ -488,7 +488,7 @@ fn handle(action: Action) {
#[test] #[test]
fn doctest_move_arm_cond_to_match_guard() { fn doctest_move_arm_cond_to_match_guard() {
check( check_doc_test(
"move_arm_cond_to_match_guard", "move_arm_cond_to_match_guard",
r#####" r#####"
enum Action { Move { distance: u32 }, Stop } enum Action { Move { distance: u32 }, Stop }
@ -515,7 +515,7 @@ fn handle(action: Action) {
#[test] #[test]
fn doctest_move_bounds_to_where_clause() { fn doctest_move_bounds_to_where_clause() {
check( check_doc_test(
"move_bounds_to_where_clause", "move_bounds_to_where_clause",
r#####" r#####"
fn apply<T, U, <|>F: FnOnce(T) -> U>(f: F, x: T) -> U { 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 {
#[test] #[test]
fn doctest_move_guard_to_arm_body() { fn doctest_move_guard_to_arm_body() {
check( check_doc_test(
"move_guard_to_arm_body", "move_guard_to_arm_body",
r#####" r#####"
enum Action { Move { distance: u32 }, Stop } enum Action { Move { distance: u32 }, Stop }
@ -559,7 +559,7 @@ fn handle(action: Action) {
#[test] #[test]
fn doctest_remove_dbg() { fn doctest_remove_dbg() {
check( check_doc_test(
"remove_dbg", "remove_dbg",
r#####" r#####"
fn main() { fn main() {
@ -576,7 +576,7 @@ fn main() {
#[test] #[test]
fn doctest_remove_hash() { fn doctest_remove_hash() {
check( check_doc_test(
"remove_hash", "remove_hash",
r#####" r#####"
fn main() { fn main() {
@ -593,7 +593,7 @@ fn main() {
#[test] #[test]
fn doctest_remove_mut() { fn doctest_remove_mut() {
check( check_doc_test(
"remove_mut", "remove_mut",
r#####" r#####"
impl Walrus { impl Walrus {
@ -610,7 +610,7 @@ impl Walrus {
#[test] #[test]
fn doctest_reorder_fields() { fn doctest_reorder_fields() {
check( check_doc_test(
"reorder_fields", "reorder_fields",
r#####" r#####"
struct Foo {foo: i32, bar: i32}; struct Foo {foo: i32, bar: i32};
@ -625,7 +625,7 @@ const test: Foo = Foo {foo: 1, bar: 0}
#[test] #[test]
fn doctest_replace_if_let_with_match() { fn doctest_replace_if_let_with_match() {
check( check_doc_test(
"replace_if_let_with_match", "replace_if_let_with_match",
r#####" r#####"
enum Action { Move { distance: u32 }, Stop } enum Action { Move { distance: u32 }, Stop }
@ -653,7 +653,7 @@ fn handle(action: Action) {
#[test] #[test]
fn doctest_replace_let_with_if_let() { fn doctest_replace_let_with_if_let() {
check( check_doc_test(
"replace_let_with_if_let", "replace_let_with_if_let",
r#####" r#####"
enum Option<T> { Some(T), None } enum Option<T> { Some(T), None }
@ -679,7 +679,7 @@ fn compute() -> Option<i32> { None }
#[test] #[test]
fn doctest_replace_qualified_name_with_use() { fn doctest_replace_qualified_name_with_use() {
check( check_doc_test(
"replace_qualified_name_with_use", "replace_qualified_name_with_use",
r#####" r#####"
fn process(map: std::collections::<|>HashMap<String, String>) {} fn process(map: std::collections::<|>HashMap<String, String>) {}
@ -694,7 +694,7 @@ fn process(map: HashMap<String, String>) {}
#[test] #[test]
fn doctest_replace_unwrap_with_match() { fn doctest_replace_unwrap_with_match() {
check( check_doc_test(
"replace_unwrap_with_match", "replace_unwrap_with_match",
r#####" r#####"
enum Result<T, E> { Ok(T), Err(E) } enum Result<T, E> { Ok(T), Err(E) }
@ -718,7 +718,7 @@ fn main() {
#[test] #[test]
fn doctest_split_import() { fn doctest_split_import() {
check( check_doc_test(
"split_import", "split_import",
r#####" r#####"
use std::<|>collections::HashMap; use std::<|>collections::HashMap;
@ -731,7 +731,7 @@ use std::{collections::HashMap};
#[test] #[test]
fn doctest_unwrap_block() { fn doctest_unwrap_block() {
check( check_doc_test(
"unwrap_block", "unwrap_block",
r#####" r#####"
fn foo() { fn foo() {

View file

@ -27,7 +27,7 @@ const AST_NODES: &str = "crates/ra_syntax/src/ast/generated/nodes.rs";
const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs"; const AST_TOKENS: &str = "crates/ra_syntax/src/ast/generated/tokens.rs";
const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers"; const ASSISTS_DIR: &str = "crates/ra_assists/src/handlers";
const ASSISTS_TESTS: &str = "crates/ra_assists/src/doc_tests/generated.rs"; const ASSISTS_TESTS: &str = "crates/ra_assists/src/tests/generated.rs";
const ASSISTS_DOCS: &str = "docs/user/assists.md"; const ASSISTS_DOCS: &str = "docs/user/assists.md";
#[derive(Debug, PartialEq, Eq, Clone, Copy)] #[derive(Debug, PartialEq, Eq, Clone, Copy)]

View file

@ -101,14 +101,14 @@ fn collect_assists() -> Result<Vec<Assist>> {
} }
fn generate_tests(assists: &[Assist], mode: Mode) -> Result<()> { fn generate_tests(assists: &[Assist], mode: Mode) -> Result<()> {
let mut buf = String::from("use super::check;\n"); let mut buf = String::from("use super::check_doc_test;\n");
for assist in assists.iter() { for assist in assists.iter() {
let test = format!( let test = format!(
r######" r######"
#[test] #[test]
fn doctest_{}() {{ fn doctest_{}() {{
check( check_doc_test(
"{}", "{}",
r#####" r#####"
{}"#####, r#####" {}"#####, r#####"

View file

@ -24,7 +24,7 @@ fn check_todo(path: &Path, text: &str) {
// This file itself is whitelisted since this test itself contains matches. // This file itself is whitelisted since this test itself contains matches.
"tests/cli.rs", "tests/cli.rs",
// Some of our assists generate `todo!()` so those files are whitelisted. // Some of our assists generate `todo!()` so those files are whitelisted.
"doc_tests/generated.rs", "tests/generated.rs",
"handlers/add_missing_impl_members.rs", "handlers/add_missing_impl_members.rs",
"handlers/add_function.rs", "handlers/add_function.rs",
// To support generating `todo!()` in assists, we have `expr_todo()` in ast::make. // To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.