Skip to content

Change add_function assist to use todo!() instead of unimplemented!() #3969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2020
Merged

Change add_function assist to use todo!() instead of unimplemented!() #3969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/ra_assists/src/doc_tests/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ fn foo() {
}

fn bar(arg: &str, baz: Baz) {
unimplemented!()
todo!()
}

"#####,
Expand Down
54 changes: 27 additions & 27 deletions crates/ra_assists/src/handlers/add_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
// }
//
// fn bar(arg: &str, baz: Baz) {
// unimplemented!()
// todo!()
// }
//
// ```
Expand Down Expand Up @@ -80,7 +80,7 @@ impl FunctionBuilder {
Some(Self { append_fn_at, fn_name, type_params, params })
}
fn render(self) -> Option<FunctionTemplate> {
let placeholder_expr = ast::make::expr_unimplemented();
let placeholder_expr = ast::make::expr_todo();
let fn_body = ast::make::block_expr(vec![], Some(placeholder_expr));
let fn_def = ast::make::fn_def(self.fn_name, self.type_params, self.params, fn_body);
let fn_def = ast::make::add_newlines(2, fn_def);
Expand Down Expand Up @@ -225,7 +225,7 @@ fn foo() {
}

fn bar() {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -252,7 +252,7 @@ impl Foo {
}

fn bar() {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -276,7 +276,7 @@ fn foo1() {
}

fn bar() {
<|>unimplemented!()
<|>todo!()
}

fn foo2() {}
Expand All @@ -302,7 +302,7 @@ mod baz {
}

fn bar() {
<|>unimplemented!()
<|>todo!()
}
}
",
Expand All @@ -315,20 +315,20 @@ mod baz {
add_function,
r"
struct Baz;
fn baz() -> Baz { unimplemented!() }
fn baz() -> Baz { todo!() }
fn foo() {
bar<|>(baz());
}
",
r"
struct Baz;
fn baz() -> Baz { unimplemented!() }
fn baz() -> Baz { todo!() }
fn foo() {
bar(baz());
}

fn bar(baz: Baz) {
<|>unimplemented!()
<|>todo!()
}
",
);
Expand Down Expand Up @@ -361,7 +361,7 @@ impl Baz {
}

fn bar(baz: Baz) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -382,7 +382,7 @@ fn foo() {
}

fn bar(arg: &str) {
<|>unimplemented!()
<|>todo!()
}
"#,
)
Expand All @@ -403,7 +403,7 @@ fn foo() {
}

fn bar(arg: char) {
<|>unimplemented!()
<|>todo!()
}
"#,
)
Expand All @@ -424,7 +424,7 @@ fn foo() {
}

fn bar(arg: i32) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -445,7 +445,7 @@ fn foo() {
}

fn bar(arg: u8) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -470,7 +470,7 @@ fn foo() {
}

fn bar(x: u8) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -493,7 +493,7 @@ fn foo() {
}

fn bar(worble: ()) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -506,7 +506,7 @@ fn bar(worble: ()) {
r"
trait Foo {}
fn foo() -> impl Foo {
unimplemented!()
todo!()
}
fn baz() {
<|>bar(foo())
Expand All @@ -515,14 +515,14 @@ fn baz() {
r"
trait Foo {}
fn foo() -> impl Foo {
unimplemented!()
todo!()
}
fn baz() {
bar(foo())
}

fn bar(foo: impl Foo) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand Down Expand Up @@ -556,7 +556,7 @@ mod Foo {
}

fn bar(baz: super::Baz::Bof) {
<|>unimplemented!()
<|>todo!()
}
}
",
Expand All @@ -580,7 +580,7 @@ fn foo<T>(t: T) {
}

fn bar<T>(t: T) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand Down Expand Up @@ -611,7 +611,7 @@ fn foo() {
}

fn bar(arg: fn() -> Baz) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -636,7 +636,7 @@ fn foo() {
}

fn bar(closure: impl Fn(i64) -> i64) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -657,7 +657,7 @@ fn foo() {
}

fn bar(baz: ()) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -682,7 +682,7 @@ fn foo() {
}

fn bar(baz_1: Baz, baz_2: Baz) {
<|>unimplemented!()
<|>todo!()
}
",
)
Expand All @@ -707,7 +707,7 @@ fn foo() {
}

fn bar(baz_1: Baz, baz_2: Baz, arg_1: &str, arg_2: &str) {
<|>unimplemented!()
<|>todo!()
}
"#,
)
Expand Down Expand Up @@ -779,7 +779,7 @@ impl Foo {
self.bar();
}
fn bar(&self) {
unimplemented!();
todo!();
}
}
",
Expand Down
2 changes: 1 addition & 1 deletion docs/user/assists.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ fn foo() {
}

fn bar(arg: &str, baz: Baz) {
unimplemented!()
todo!()
}

```
Expand Down
1 change: 1 addition & 0 deletions xtask/tests/tidy-tests/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ fn check_todo(path: &Path, text: &str) {
// Some of our assists generate `todo!()` so those files are whitelisted.
"doc_tests/generated.rs",
"handlers/add_missing_impl_members.rs",
"handlers/add_function.rs",
// To support generating `todo!()` in assists, we have `expr_todo()` in ast::make.
"ast/make.rs",
];
Expand Down