Merge #3969

bors[bot] · TimoFreiberg · web-flow · commit 923efa72bd41 · 2020-04-15T08:55:44.000Z
3969: Change add_function assist to use todo!() instead of unimplemented!() r=matklad a=TimoFreiberg In the spirit of #3935 Co-authored-by: Timo Freiberg <timo.freiberg@gmail.com>
diff --git a/crates/ra_assists/src/doc_tests/generated.rs b/crates/ra_assists/src/doc_tests/generated.rs
@@ -78,7 +78,7 @@ fn foo() {
 }
 
 fn bar(arg: &str, baz: Baz) {
-    unimplemented!()
+    todo!()
 }
 
 "#####,
diff --git a/crates/ra_assists/src/handlers/add_function.rs b/crates/ra_assists/src/handlers/add_function.rs
@@ -29,7 +29,7 @@ use rustc_hash::{FxHashMap, FxHashSet};
 // }
 //
 // fn bar(arg: &str, baz: Baz) {
-//     unimplemented!()
+//     todo!()
 // }
 //
 // ```
@@ -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);
@@ -225,7 +225,7 @@ fn foo() {
 }
 
 fn bar() {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -252,7 +252,7 @@ impl Foo {
 }
 
 fn bar() {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -276,7 +276,7 @@ fn foo1() {
 }
 
 fn bar() {
-    <|>unimplemented!()
+    <|>todo!()
 }
 
 fn foo2() {}
@@ -302,7 +302,7 @@ mod baz {
     }
 
     fn bar() {
-        <|>unimplemented!()
+        <|>todo!()
     }
 }
 ",
@@ -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!()
 }
 ",
         );
@@ -361,7 +361,7 @@ impl Baz {
 }
 
 fn bar(baz: Baz) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -382,7 +382,7 @@ fn foo() {
 }
 
 fn bar(arg: &str) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 "#,
         )
@@ -403,7 +403,7 @@ fn foo() {
 }
 
 fn bar(arg: char) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 "#,
         )
@@ -424,7 +424,7 @@ fn foo() {
 }
 
 fn bar(arg: i32) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -445,7 +445,7 @@ fn foo() {
 }
 
 fn bar(arg: u8) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -470,7 +470,7 @@ fn foo() {
 }
 
 fn bar(x: u8) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -493,7 +493,7 @@ fn foo() {
 }
 
 fn bar(worble: ()) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -506,7 +506,7 @@ fn bar(worble: ()) {
             r"
 trait Foo {}
 fn foo() -> impl Foo {
-    unimplemented!()
+    todo!()
 }
 fn baz() {
     <|>bar(foo())
@@ -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!()
 }
 ",
         )
@@ -556,7 +556,7 @@ mod Foo {
     }
 
     fn bar(baz: super::Baz::Bof) {
-        <|>unimplemented!()
+        <|>todo!()
     }
 }
 ",
@@ -580,7 +580,7 @@ fn foo<T>(t: T) {
 }
 
 fn bar<T>(t: T) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -611,7 +611,7 @@ fn foo() {
 }
 
 fn bar(arg: fn() -> Baz) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -636,7 +636,7 @@ fn foo() {
 }
 
 fn bar(closure: impl Fn(i64) -> i64) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -657,7 +657,7 @@ fn foo() {
 }
 
 fn bar(baz: ()) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -682,7 +682,7 @@ fn foo() {
 }
 
 fn bar(baz_1: Baz, baz_2: Baz) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 ",
         )
@@ -707,7 +707,7 @@ fn foo() {
 }
 
 fn bar(baz_1: Baz, baz_2: Baz, arg_1: &str, arg_2: &str) {
-    <|>unimplemented!()
+    <|>todo!()
 }
 "#,
         )
@@ -779,7 +779,7 @@ impl Foo {
         self.bar();
     }
     fn bar(&self) {
-        unimplemented!();
+        todo!();
     }
 }
         ",
diff --git a/docs/user/assists.md b/docs/user/assists.md
@@ -77,7 +77,7 @@ fn foo() {
 }
 
 fn bar(arg: &str, baz: Baz) {
-    unimplemented!()
+    todo!()
 }
 
 ```
diff --git a/xtask/tests/tidy-tests/main.rs b/xtask/tests/tidy-tests/main.rs
@@ -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",
     ];

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ fn foo() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`fn bar(arg: &str, baz: Baz) {`
`81`		`- unimplemented!()`
	`81`	`+ todo!()`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`"#####,`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ use rustc_hash::{FxHashMap, FxHashSet};`
`29`	`29`	`// }`
`30`	`30`	`//`
`31`	`31`	`// fn bar(arg: &str, baz: Baz) {`
`32`		`-// unimplemented!()`
	`32`	`+// todo!()`
`33`	`33`	`// }`
`34`	`34`	`//`
`35`	`35`	// ```
`@@ -80,7 +80,7 @@ impl FunctionBuilder {`
`80`	`80`	`Some(Self { append_fn_at, fn_name, type_params, params })`
`81`	`81`	`}`
`82`	`82`	`fn render(self) -> Option<FunctionTemplate> {`
`83`		`- let placeholder_expr = ast::make::expr_unimplemented();`
	`83`	`+ let placeholder_expr = ast::make::expr_todo();`
`84`	`84`	`let fn_body = ast::make::block_expr(vec![], Some(placeholder_expr));`
`85`	`85`	`let fn_def = ast::make::fn_def(self.fn_name, self.type_params, self.params, fn_body);`
`86`	`86`	`let fn_def = ast::make::add_newlines(2, fn_def);`
`@@ -225,7 +225,7 @@ fn foo() {`
`225`	`225`	`}`
`226`	`226`
`227`	`227`	`fn bar() {`
`228`		`- <\|>unimplemented!()`
	`228`	`+ <\|>todo!()`
`229`	`229`	`}`
`230`	`230`	`",`
`231`	`231`	`)`
`@@ -252,7 +252,7 @@ impl Foo {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`fn bar() {`
`255`		`- <\|>unimplemented!()`
	`255`	`+ <\|>todo!()`
`256`	`256`	`}`
`257`	`257`	`",`
`258`	`258`	`)`
`@@ -276,7 +276,7 @@ fn foo1() {`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`fn bar() {`
`279`		`- <\|>unimplemented!()`
	`279`	`+ <\|>todo!()`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`fn foo2() {}`
`@@ -302,7 +302,7 @@ mod baz {`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`fn bar() {`
`305`		`- <\|>unimplemented!()`
	`305`	`+ <\|>todo!()`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`	`",`
`@@ -315,20 +315,20 @@ mod baz {`
`315`	`315`	`add_function,`
`316`	`316`	`r"`
`317`	`317`	`struct Baz;`
`318`		`-fn baz() -> Baz { unimplemented!() }`
	`318`	`+fn baz() -> Baz { todo!() }`
`319`	`319`	`fn foo() {`
`320`	`320`	`bar<\|>(baz());`
`321`	`321`	`}`
`322`	`322`	`",`
`323`	`323`	`r"`
`324`	`324`	`struct Baz;`
`325`		`-fn baz() -> Baz { unimplemented!() }`
	`325`	`+fn baz() -> Baz { todo!() }`
`326`	`326`	`fn foo() {`
`327`	`327`	`bar(baz());`
`328`	`328`	`}`
`329`	`329`
`330`	`330`	`fn bar(baz: Baz) {`
`331`		`- <\|>unimplemented!()`
	`331`	`+ <\|>todo!()`
`332`	`332`	`}`
`333`	`333`	`",`
`334`	`334`	`);`
`@@ -361,7 +361,7 @@ impl Baz {`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`fn bar(baz: Baz) {`
`364`		`- <\|>unimplemented!()`
	`364`	`+ <\|>todo!()`
`365`	`365`	`}`
`366`	`366`	`",`
`367`	`367`	`)`
`@@ -382,7 +382,7 @@ fn foo() {`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`fn bar(arg: &str) {`
`385`		`- <\|>unimplemented!()`
	`385`	`+ <\|>todo!()`
`386`	`386`	`}`
`387`	`387`	`"#,`
`388`	`388`	`)`
`@@ -403,7 +403,7 @@ fn foo() {`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`fn bar(arg: char) {`
`406`		`- <\|>unimplemented!()`
	`406`	`+ <\|>todo!()`
`407`	`407`	`}`
`408`	`408`	`"#,`
`409`	`409`	`)`
`@@ -424,7 +424,7 @@ fn foo() {`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`fn bar(arg: i32) {`
`427`		`- <\|>unimplemented!()`
	`427`	`+ <\|>todo!()`
`428`	`428`	`}`
`429`	`429`	`",`
`430`	`430`	`)`
`@@ -445,7 +445,7 @@ fn foo() {`
`445`	`445`	`}`
`446`	`446`
`447`	`447`	`fn bar(arg: u8) {`
`448`		`- <\|>unimplemented!()`
	`448`	`+ <\|>todo!()`
`449`	`449`	`}`
`450`	`450`	`",`
`451`	`451`	`)`
`@@ -470,7 +470,7 @@ fn foo() {`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`fn bar(x: u8) {`
`473`		`- <\|>unimplemented!()`
	`473`	`+ <\|>todo!()`
`474`	`474`	`}`
`475`	`475`	`",`
`476`	`476`	`)`
`@@ -493,7 +493,7 @@ fn foo() {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`fn bar(worble: ()) {`
`496`		`- <\|>unimplemented!()`
	`496`	`+ <\|>todo!()`
`497`	`497`	`}`
`498`	`498`	`",`
`499`	`499`	`)`
`@@ -506,7 +506,7 @@ fn bar(worble: ()) {`
`506`	`506`	`r"`
`507`	`507`	`trait Foo {}`
`508`	`508`	`fn foo() -> impl Foo {`
`509`		`- unimplemented!()`
	`509`	`+ todo!()`
`510`	`510`	`}`
`511`	`511`	`fn baz() {`
`512`	`512`	`<\|>bar(foo())`
`@@ -515,14 +515,14 @@ fn baz() {`
`515`	`515`	`r"`
`516`	`516`	`trait Foo {}`
`517`	`517`	`fn foo() -> impl Foo {`
`518`		`- unimplemented!()`
	`518`	`+ todo!()`
`519`	`519`	`}`
`520`	`520`	`fn baz() {`
`521`	`521`	`bar(foo())`
`522`	`522`	`}`
`523`	`523`
`524`	`524`	`fn bar(foo: impl Foo) {`
`525`		`- <\|>unimplemented!()`
	`525`	`+ <\|>todo!()`
`526`	`526`	`}`
`527`	`527`	`",`
`528`	`528`	`)`
`@@ -556,7 +556,7 @@ mod Foo {`
`556`	`556`	`}`
`557`	`557`
`558`	`558`	`fn bar(baz: super::Baz::Bof) {`
`559`		`- <\|>unimplemented!()`
	`559`	`+ <\|>todo!()`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`	`",`
`@@ -580,7 +580,7 @@ fn foo<T>(t: T) {`
`580`	`580`	`}`
`581`	`581`
`582`	`582`	`fn bar<T>(t: T) {`
`583`		`- <\|>unimplemented!()`
	`583`	`+ <\|>todo!()`
`584`	`584`	`}`
`585`	`585`	`",`
`586`	`586`	`)`
`@@ -611,7 +611,7 @@ fn foo() {`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`fn bar(arg: fn() -> Baz) {`
`614`		`- <\|>unimplemented!()`
	`614`	`+ <\|>todo!()`
`615`	`615`	`}`
`616`	`616`	`",`
`617`	`617`	`)`
`@@ -636,7 +636,7 @@ fn foo() {`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`fn bar(closure: impl Fn(i64) -> i64) {`
`639`		`- <\|>unimplemented!()`
	`639`	`+ <\|>todo!()`
`640`	`640`	`}`
`641`	`641`	`",`
`642`	`642`	`)`
`@@ -657,7 +657,7 @@ fn foo() {`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`fn bar(baz: ()) {`
`660`		`- <\|>unimplemented!()`
	`660`	`+ <\|>todo!()`
`661`	`661`	`}`
`662`	`662`	`",`
`663`	`663`	`)`
`@@ -682,7 +682,7 @@ fn foo() {`
`682`	`682`	`}`
`683`	`683`
`684`	`684`	`fn bar(baz_1: Baz, baz_2: Baz) {`
`685`		`- <\|>unimplemented!()`
	`685`	`+ <\|>todo!()`
`686`	`686`	`}`
`687`	`687`	`",`
`688`	`688`	`)`
`@@ -707,7 +707,7 @@ fn foo() {`
`707`	`707`	`}`
`708`	`708`
`709`	`709`	`fn bar(baz_1: Baz, baz_2: Baz, arg_1: &str, arg_2: &str) {`
`710`		`- <\|>unimplemented!()`
	`710`	`+ <\|>todo!()`
`711`	`711`	`}`
`712`	`712`	`"#,`
`713`	`713`	`)`
`@@ -779,7 +779,7 @@ impl Foo {`
`779`	`779`	`self.bar();`
`780`	`780`	`}`
`781`	`781`	`fn bar(&self) {`
`782`		`- unimplemented!();`
	`782`	`+ todo!();`
`783`	`783`	`}`
`784`	`784`	`}`
`785`	`785`	`",`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fn foo() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`fn bar(arg: &str, baz: Baz) {`
`80`		`- unimplemented!()`
	`80`	`+ todo!()`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	```