mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #11128

Browse Source 
11128: import style r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-12-28 10:53:02 +00:00 committed by GitHub
commit d6c3070017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ide_db/src/helpers.rs
View File

@ -14,7 +14,7 @@ use base_db::FileId;
use hir::{ItemInNs, MacroDef, ModuleDef, Name, PathResolution, Semantics}; use hir::{ItemInNs, MacroDef, ModuleDef, Name, PathResolution, Semantics};
use itertools::Itertools; use itertools::Itertools;
use syntax::{ use syntax::{
ast::{self, make, HasLoopBody, Ident}, ast::{self, make, HasLoopBody},
AstNode, AstToken, Direction, SyntaxElement, SyntaxKind, SyntaxToken, TokenAtOffset, WalkEvent, AstNode, AstToken, Direction, SyntaxElement, SyntaxKind, SyntaxToken, TokenAtOffset, WalkEvent,
T, T,
}; };
@ -38,7 +38,7 @@ pub fn item_name(db: &RootDatabase, item: ItemInNs) -> Option<Name> {
pub fn get_path_in_derive_attr( pub fn get_path_in_derive_attr(
sema: &hir::Semantics<RootDatabase>, sema: &hir::Semantics<RootDatabase>,
attr: &ast::Attr, attr: &ast::Attr,
cursor: &Ident, cursor: &ast::Ident,
) -> Option<ast::Path> { ) -> Option<ast::Path> {
let path = attr.path()?; let path = attr.path()?;
let tt = attr.token_tree()?; let tt = attr.token_tree()?;
@ -55,7 +55,7 @@ pub fn get_path_in_derive_attr(
} }
/// Parses the path the identifier is part of inside a token tree. /// Parses the path the identifier is part of inside a token tree.
pub fn get_path_at_cursor_in_tt(cursor: &Ident) -> Option<ast::Path> { pub fn get_path_at_cursor_in_tt(cursor: &ast::Ident) -> Option<ast::Path> {
let cursor = cursor.syntax(); let cursor = cursor.syntax();
let first = cursor let first = cursor
.siblings_with_tokens(Direction::Prev) .siblings_with_tokens(Direction::Prev)
@ -75,7 +75,7 @@ pub fn get_path_at_cursor_in_tt(cursor: &Ident) -> Option<ast::Path> {
pub fn try_resolve_derive_input( pub fn try_resolve_derive_input(
sema: &hir::Semantics<RootDatabase>, sema: &hir::Semantics<RootDatabase>,
attr: &ast::Attr, attr: &ast::Attr,
cursor: &Ident, cursor: &ast::Ident,
) -> Option<PathResolution> { ) -> Option<PathResolution> {
let path = get_path_in_derive_attr(sema, attr, cursor)?; let path = get_path_in_derive_attr(sema, attr, cursor)?;
let scope = sema.scope(attr.syntax()); let scope = sema.scope(attr.syntax());