diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-18 20:26:08 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-18 20:26:08 +0100 |
commit | 7f8f569c58583915a6e6ccae8292fa078d6bed70 (patch) | |
tree | 4f03ef4a9b684ba96da926ee2ffabcf7398b4f6f /crates/ide_assists/src | |
parent | c2f15270ee207ae787b08abdac2c8944b96306c9 (diff) | |
parent | 73b3ee664ecc938b943b5a08a23ef29104fc390f (diff) |
Merge #9330
9330: minor: use minicore r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ide_assists/src')
-rw-r--r-- | crates/ide_assists/src/handlers/extract_function.rs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs index 43e83d683..ac7f0959b 100644 --- a/crates/ide_assists/src/handlers/extract_function.rs +++ b/crates/ide_assists/src/handlers/extract_function.rs | |||
@@ -831,7 +831,6 @@ fn path_element_of_reference( | |||
831 | })?; | 831 | })?; |
832 | stdx::always!( | 832 | stdx::always!( |
833 | matches!(path, ast::Expr::PathExpr(_) | ast::Expr::MacroCall(_)), | 833 | matches!(path, ast::Expr::PathExpr(_) | ast::Expr::MacroCall(_)), |
834 | |||
835 | "unexpected expression type for variable usage: {:?}", | 834 | "unexpected expression type for variable usage: {:?}", |
836 | path | 835 | path |
837 | ); | 836 | ); |
@@ -2991,11 +2990,7 @@ mod bar { | |||
2991 | check_assist( | 2990 | check_assist( |
2992 | extract_function, | 2991 | extract_function, |
2993 | r#" | 2992 | r#" |
2994 | enum Option<T> { | 2993 | //- minicore: option |
2995 | #[lang = "None"] None, | ||
2996 | #[lang = "Some"] Some(T), | ||
2997 | } | ||
2998 | use Option::*; | ||
2999 | fn foo() { | 2994 | fn foo() { |
3000 | loop { | 2995 | loop { |
3001 | let n = 1; | 2996 | let n = 1; |
@@ -3007,11 +3002,6 @@ fn foo() { | |||
3007 | } | 3002 | } |
3008 | "#, | 3003 | "#, |
3009 | r#" | 3004 | r#" |
3010 | enum Option<T> { | ||
3011 | #[lang = "None"] None, | ||
3012 | #[lang = "Some"] Some(T), | ||
3013 | } | ||
3014 | use Option::*; | ||
3015 | fn foo() { | 3005 | fn foo() { |
3016 | loop { | 3006 | loop { |
3017 | let n = 1; | 3007 | let n = 1; |