diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-30 14:26:15 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-30 14:26:15 +0100 |
commit | ee00679331b87dacc5fe608f153be160c1cb144c (patch) | |
tree | f80ef7823490a6904b3f7bf57a4609ca4c4743dc /crates/ra_ide/src/file_structure.rs | |
parent | 96c3ff1c573f97e5089fc0ba01ede6fe43693668 (diff) | |
parent | eb2f8063444b11257111f4f8ade990ec810e0361 (diff) |
Merge #5591
5591: Rename TypeAliasDef -> TypeAlias r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide/src/file_structure.rs')
-rw-r--r-- | crates/ra_ide/src/file_structure.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crates/ra_ide/src/file_structure.rs b/crates/ra_ide/src/file_structure.rs index 1f6a3febf..8ef977761 100644 --- a/crates/ra_ide/src/file_structure.rs +++ b/crates/ra_ide/src/file_structure.rs | |||
@@ -111,7 +111,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | |||
111 | 111 | ||
112 | match_ast! { | 112 | match_ast! { |
113 | match node { | 113 | match node { |
114 | ast::FnDef(it) => { | 114 | ast::Fn(it) => { |
115 | let mut detail = String::from("fn"); | 115 | let mut detail = String::from("fn"); |
116 | if let Some(type_param_list) = it.type_param_list() { | 116 | if let Some(type_param_list) = it.type_param_list() { |
117 | collapse_ws(type_param_list.syntax(), &mut detail); | 117 | collapse_ws(type_param_list.syntax(), &mut detail); |
@@ -132,7 +132,7 @@ fn structure_node(node: &SyntaxNode) -> Option<StructureNode> { | |||
132 | ast::EnumVariant(it) => decl(it), | 132 | ast::EnumVariant(it) => decl(it), |
133 | ast::TraitDef(it) => decl(it), | 133 | ast::TraitDef(it) => decl(it), |
134 | ast::Module(it) => decl(it), | 134 | ast::Module(it) => decl(it), |
135 | ast::TypeAliasDef(it) => { | 135 | ast::TypeAlias(it) => { |
136 | let ty = it.type_ref(); | 136 | let ty = it.type_ref(); |
137 | decl_with_type_ref(it, ty) | 137 | decl_with_type_ref(it, ty) |
138 | }, | 138 | }, |
@@ -271,7 +271,7 @@ fn very_obsolete() {} | |||
271 | label: "bar1", | 271 | label: "bar1", |
272 | navigation_range: 43..47, | 272 | navigation_range: 43..47, |
273 | node_range: 40..52, | 273 | node_range: 40..52, |
274 | kind: FN_DEF, | 274 | kind: FN, |
275 | detail: Some( | 275 | detail: Some( |
276 | "fn()", | 276 | "fn()", |
277 | ), | 277 | ), |
@@ -284,7 +284,7 @@ fn very_obsolete() {} | |||
284 | label: "bar2", | 284 | label: "bar2", |
285 | navigation_range: 60..64, | 285 | navigation_range: 60..64, |
286 | node_range: 57..81, | 286 | node_range: 57..81, |
287 | kind: FN_DEF, | 287 | kind: FN, |
288 | detail: Some( | 288 | detail: Some( |
289 | "fn<T>(t: T) -> T", | 289 | "fn<T>(t: T) -> T", |
290 | ), | 290 | ), |
@@ -297,7 +297,7 @@ fn very_obsolete() {} | |||
297 | label: "bar3", | 297 | label: "bar3", |
298 | navigation_range: 89..93, | 298 | navigation_range: 89..93, |
299 | node_range: 86..156, | 299 | node_range: 86..156, |
300 | kind: FN_DEF, | 300 | kind: FN, |
301 | detail: Some( | 301 | detail: Some( |
302 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", | 302 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", |
303 | ), | 303 | ), |
@@ -339,7 +339,7 @@ fn very_obsolete() {} | |||
339 | label: "T", | 339 | label: "T", |
340 | navigation_range: 186..187, | 340 | navigation_range: 186..187, |
341 | node_range: 181..193, | 341 | node_range: 181..193, |
342 | kind: TYPE_ALIAS_DEF, | 342 | kind: TYPE_ALIAS, |
343 | detail: Some( | 343 | detail: Some( |
344 | "()", | 344 | "()", |
345 | ), | 345 | ), |
@@ -417,7 +417,7 @@ fn very_obsolete() {} | |||
417 | label: "obsolete", | 417 | label: "obsolete", |
418 | navigation_range: 428..436, | 418 | navigation_range: 428..436, |
419 | node_range: 411..441, | 419 | node_range: 411..441, |
420 | kind: FN_DEF, | 420 | kind: FN, |
421 | detail: Some( | 421 | detail: Some( |
422 | "fn()", | 422 | "fn()", |
423 | ), | 423 | ), |
@@ -428,7 +428,7 @@ fn very_obsolete() {} | |||
428 | label: "very_obsolete", | 428 | label: "very_obsolete", |
429 | navigation_range: 481..494, | 429 | navigation_range: 481..494, |
430 | node_range: 443..499, | 430 | node_range: 443..499, |
431 | kind: FN_DEF, | 431 | kind: FN, |
432 | detail: Some( | 432 | detail: Some( |
433 | "fn()", | 433 | "fn()", |
434 | ), | 434 | ), |