diff options
Diffstat (limited to 'crates/ra_ide/src/display')
-rw-r--r-- | crates/ra_ide/src/display/navigation_target.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide/src/display/structure.rs | 76 |
2 files changed, 40 insertions, 40 deletions
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs index 67bc9c31b..914a8b471 100644 --- a/crates/ra_ide/src/display/navigation_target.rs +++ b/crates/ra_ide/src/display/navigation_target.rs | |||
@@ -189,7 +189,7 @@ impl TryToNav for Definition { | |||
189 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { | 189 | fn try_to_nav(&self, db: &RootDatabase) -> Option<NavigationTarget> { |
190 | match self { | 190 | match self { |
191 | Definition::Macro(it) => Some(it.to_nav(db)), | 191 | Definition::Macro(it) => Some(it.to_nav(db)), |
192 | Definition::StructField(it) => Some(it.to_nav(db)), | 192 | Definition::Field(it) => Some(it.to_nav(db)), |
193 | Definition::ModuleDef(it) => it.try_to_nav(db), | 193 | Definition::ModuleDef(it) => it.try_to_nav(db), |
194 | Definition::SelfType(it) => Some(it.to_nav(db)), | 194 | Definition::SelfType(it) => Some(it.to_nav(db)), |
195 | Definition::Local(it) => Some(it.to_nav(db)), | 195 | Definition::Local(it) => Some(it.to_nav(db)), |
@@ -286,7 +286,7 @@ impl ToNav for hir::ImplDef { | |||
286 | } | 286 | } |
287 | } | 287 | } |
288 | 288 | ||
289 | impl ToNav for hir::StructField { | 289 | impl ToNav for hir::Field { |
290 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { | 290 | fn to_nav(&self, db: &RootDatabase) -> NavigationTarget { |
291 | let src = self.source(db); | 291 | let src = self.source(db); |
292 | 292 | ||
diff --git a/crates/ra_ide/src/display/structure.rs b/crates/ra_ide/src/display/structure.rs index 7a774785c..967eee5d2 100644 --- a/crates/ra_ide/src/display/structure.rs +++ b/crates/ra_ide/src/display/structure.rs | |||
@@ -224,8 +224,8 @@ fn very_obsolete() {} | |||
224 | StructureNode { | 224 | StructureNode { |
225 | parent: None, | 225 | parent: None, |
226 | label: "Foo", | 226 | label: "Foo", |
227 | navigation_range: [8; 11), | 227 | navigation_range: 8..11, |
228 | node_range: [1; 26), | 228 | node_range: 1..26, |
229 | kind: STRUCT_DEF, | 229 | kind: STRUCT_DEF, |
230 | detail: None, | 230 | detail: None, |
231 | deprecated: false, | 231 | deprecated: false, |
@@ -235,8 +235,8 @@ fn very_obsolete() {} | |||
235 | 0, | 235 | 0, |
236 | ), | 236 | ), |
237 | label: "x", | 237 | label: "x", |
238 | navigation_range: [18; 19), | 238 | navigation_range: 18..19, |
239 | node_range: [18; 24), | 239 | node_range: 18..24, |
240 | kind: RECORD_FIELD_DEF, | 240 | kind: RECORD_FIELD_DEF, |
241 | detail: Some( | 241 | detail: Some( |
242 | "i32", | 242 | "i32", |
@@ -246,8 +246,8 @@ fn very_obsolete() {} | |||
246 | StructureNode { | 246 | StructureNode { |
247 | parent: None, | 247 | parent: None, |
248 | label: "m", | 248 | label: "m", |
249 | navigation_range: [32; 33), | 249 | navigation_range: 32..33, |
250 | node_range: [28; 158), | 250 | node_range: 28..158, |
251 | kind: MODULE, | 251 | kind: MODULE, |
252 | detail: None, | 252 | detail: None, |
253 | deprecated: false, | 253 | deprecated: false, |
@@ -257,8 +257,8 @@ fn very_obsolete() {} | |||
257 | 2, | 257 | 2, |
258 | ), | 258 | ), |
259 | label: "bar1", | 259 | label: "bar1", |
260 | navigation_range: [43; 47), | 260 | navigation_range: 43..47, |
261 | node_range: [40; 52), | 261 | node_range: 40..52, |
262 | kind: FN_DEF, | 262 | kind: FN_DEF, |
263 | detail: Some( | 263 | detail: Some( |
264 | "fn()", | 264 | "fn()", |
@@ -270,8 +270,8 @@ fn very_obsolete() {} | |||
270 | 2, | 270 | 2, |
271 | ), | 271 | ), |
272 | label: "bar2", | 272 | label: "bar2", |
273 | navigation_range: [60; 64), | 273 | navigation_range: 60..64, |
274 | node_range: [57; 81), | 274 | node_range: 57..81, |
275 | kind: FN_DEF, | 275 | kind: FN_DEF, |
276 | detail: Some( | 276 | detail: Some( |
277 | "fn<T>(t: T) -> T", | 277 | "fn<T>(t: T) -> T", |
@@ -283,8 +283,8 @@ fn very_obsolete() {} | |||
283 | 2, | 283 | 2, |
284 | ), | 284 | ), |
285 | label: "bar3", | 285 | label: "bar3", |
286 | navigation_range: [89; 93), | 286 | navigation_range: 89..93, |
287 | node_range: [86; 156), | 287 | node_range: 86..156, |
288 | kind: FN_DEF, | 288 | kind: FN_DEF, |
289 | detail: Some( | 289 | detail: Some( |
290 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", | 290 | "fn<A, B>(a: A, b: B) -> Vec< u32 >", |
@@ -294,8 +294,8 @@ fn very_obsolete() {} | |||
294 | StructureNode { | 294 | StructureNode { |
295 | parent: None, | 295 | parent: None, |
296 | label: "E", | 296 | label: "E", |
297 | navigation_range: [165; 166), | 297 | navigation_range: 165..166, |
298 | node_range: [160; 180), | 298 | node_range: 160..180, |
299 | kind: ENUM_DEF, | 299 | kind: ENUM_DEF, |
300 | detail: None, | 300 | detail: None, |
301 | deprecated: false, | 301 | deprecated: false, |
@@ -305,8 +305,8 @@ fn very_obsolete() {} | |||
305 | 6, | 305 | 6, |
306 | ), | 306 | ), |
307 | label: "X", | 307 | label: "X", |
308 | navigation_range: [169; 170), | 308 | navigation_range: 169..170, |
309 | node_range: [169; 170), | 309 | node_range: 169..170, |
310 | kind: ENUM_VARIANT, | 310 | kind: ENUM_VARIANT, |
311 | detail: None, | 311 | detail: None, |
312 | deprecated: false, | 312 | deprecated: false, |
@@ -316,8 +316,8 @@ fn very_obsolete() {} | |||
316 | 6, | 316 | 6, |
317 | ), | 317 | ), |
318 | label: "Y", | 318 | label: "Y", |
319 | navigation_range: [172; 173), | 319 | navigation_range: 172..173, |
320 | node_range: [172; 178), | 320 | node_range: 172..178, |
321 | kind: ENUM_VARIANT, | 321 | kind: ENUM_VARIANT, |
322 | detail: None, | 322 | detail: None, |
323 | deprecated: false, | 323 | deprecated: false, |
@@ -325,8 +325,8 @@ fn very_obsolete() {} | |||
325 | StructureNode { | 325 | StructureNode { |
326 | parent: None, | 326 | parent: None, |
327 | label: "T", | 327 | label: "T", |
328 | navigation_range: [186; 187), | 328 | navigation_range: 186..187, |
329 | node_range: [181; 193), | 329 | node_range: 181..193, |
330 | kind: TYPE_ALIAS_DEF, | 330 | kind: TYPE_ALIAS_DEF, |
331 | detail: Some( | 331 | detail: Some( |
332 | "()", | 332 | "()", |
@@ -336,8 +336,8 @@ fn very_obsolete() {} | |||
336 | StructureNode { | 336 | StructureNode { |
337 | parent: None, | 337 | parent: None, |
338 | label: "S", | 338 | label: "S", |
339 | navigation_range: [201; 202), | 339 | navigation_range: 201..202, |
340 | node_range: [194; 213), | 340 | node_range: 194..213, |
341 | kind: STATIC_DEF, | 341 | kind: STATIC_DEF, |
342 | detail: Some( | 342 | detail: Some( |
343 | "i32", | 343 | "i32", |
@@ -347,8 +347,8 @@ fn very_obsolete() {} | |||
347 | StructureNode { | 347 | StructureNode { |
348 | parent: None, | 348 | parent: None, |
349 | label: "C", | 349 | label: "C", |
350 | navigation_range: [220; 221), | 350 | navigation_range: 220..221, |
351 | node_range: [214; 232), | 351 | node_range: 214..232, |
352 | kind: CONST_DEF, | 352 | kind: CONST_DEF, |
353 | detail: Some( | 353 | detail: Some( |
354 | "i32", | 354 | "i32", |
@@ -358,8 +358,8 @@ fn very_obsolete() {} | |||
358 | StructureNode { | 358 | StructureNode { |
359 | parent: None, | 359 | parent: None, |
360 | label: "impl E", | 360 | label: "impl E", |
361 | navigation_range: [239; 240), | 361 | navigation_range: 239..240, |
362 | node_range: [234; 243), | 362 | node_range: 234..243, |
363 | kind: IMPL_DEF, | 363 | kind: IMPL_DEF, |
364 | detail: None, | 364 | detail: None, |
365 | deprecated: false, | 365 | deprecated: false, |
@@ -367,8 +367,8 @@ fn very_obsolete() {} | |||
367 | StructureNode { | 367 | StructureNode { |
368 | parent: None, | 368 | parent: None, |
369 | label: "impl fmt::Debug for E", | 369 | label: "impl fmt::Debug for E", |
370 | navigation_range: [265; 266), | 370 | navigation_range: 265..266, |
371 | node_range: [245; 269), | 371 | node_range: 245..269, |
372 | kind: IMPL_DEF, | 372 | kind: IMPL_DEF, |
373 | detail: None, | 373 | detail: None, |
374 | deprecated: false, | 374 | deprecated: false, |
@@ -376,8 +376,8 @@ fn very_obsolete() {} | |||
376 | StructureNode { | 376 | StructureNode { |
377 | parent: None, | 377 | parent: None, |
378 | label: "mc", | 378 | label: "mc", |
379 | navigation_range: [284; 286), | 379 | navigation_range: 284..286, |
380 | node_range: [271; 303), | 380 | node_range: 271..303, |
381 | kind: MACRO_CALL, | 381 | kind: MACRO_CALL, |
382 | detail: None, | 382 | detail: None, |
383 | deprecated: false, | 383 | deprecated: false, |
@@ -385,8 +385,8 @@ fn very_obsolete() {} | |||
385 | StructureNode { | 385 | StructureNode { |
386 | parent: None, | 386 | parent: None, |
387 | label: "mcexp", | 387 | label: "mcexp", |
388 | navigation_range: [334; 339), | 388 | navigation_range: 334..339, |
389 | node_range: [305; 356), | 389 | node_range: 305..356, |
390 | kind: MACRO_CALL, | 390 | kind: MACRO_CALL, |
391 | detail: None, | 391 | detail: None, |
392 | deprecated: false, | 392 | deprecated: false, |
@@ -394,8 +394,8 @@ fn very_obsolete() {} | |||
394 | StructureNode { | 394 | StructureNode { |
395 | parent: None, | 395 | parent: None, |
396 | label: "mcexp", | 396 | label: "mcexp", |
397 | navigation_range: [387; 392), | 397 | navigation_range: 387..392, |
398 | node_range: [358; 409), | 398 | node_range: 358..409, |
399 | kind: MACRO_CALL, | 399 | kind: MACRO_CALL, |
400 | detail: None, | 400 | detail: None, |
401 | deprecated: false, | 401 | deprecated: false, |
@@ -403,8 +403,8 @@ fn very_obsolete() {} | |||
403 | StructureNode { | 403 | StructureNode { |
404 | parent: None, | 404 | parent: None, |
405 | label: "obsolete", | 405 | label: "obsolete", |
406 | navigation_range: [428; 436), | 406 | navigation_range: 428..436, |
407 | node_range: [411; 441), | 407 | node_range: 411..441, |
408 | kind: FN_DEF, | 408 | kind: FN_DEF, |
409 | detail: Some( | 409 | detail: Some( |
410 | "fn()", | 410 | "fn()", |
@@ -414,8 +414,8 @@ fn very_obsolete() {} | |||
414 | StructureNode { | 414 | StructureNode { |
415 | parent: None, | 415 | parent: None, |
416 | label: "very_obsolete", | 416 | label: "very_obsolete", |
417 | navigation_range: [481; 494), | 417 | navigation_range: 481..494, |
418 | node_range: [443; 499), | 418 | node_range: 443..499, |
419 | kind: FN_DEF, | 419 | kind: FN_DEF, |
420 | detail: Some( | 420 | detail: Some( |
421 | "fn()", | 421 | "fn()", |