Skip to content

Commit fafacf3

Browse files
committed
Auto merge of #17555 - Veykril:grammar-inline, r=Veykril
internal: Inline generated syntax methods
2 parents 9a04253 + 0ee4ff2 commit fafacf3

26 files changed

+1115
-41
lines changed

src/tools/rust-analyzer/crates/hir-def/src/body/lower.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ use span::AstIdMap;
1515
use stdx::never;
1616
use syntax::{
1717
ast::{
18-
self, ArrayExprKind, AstChildren, BlockExpr, HasArgList, HasAttrs, HasLoopBody, HasName,
19-
RangeItem, SlicePatComponents,
18+
self, ArrayExprKind, AstChildren, BlockExpr, HasArgList, HasAttrs, HasGenericArgs,
19+
HasLoopBody, HasName, RangeItem, SlicePatComponents,
2020
},
2121
AstNode, AstPtr, AstToken as _, SyntaxNodePtr,
2222
};

src/tools/rust-analyzer/crates/hir-def/src/hir/type_ref.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use hir_expand::{
1010
AstId,
1111
};
1212
use intern::Interned;
13-
use syntax::ast::{self, HasName, IsString};
13+
use syntax::ast::{self, HasGenericArgs, HasName, IsString};
1414

1515
use crate::{
1616
builtin_type::{BuiltinInt, BuiltinType, BuiltinUint},

src/tools/rust-analyzer/crates/hir-def/src/path/lower.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use hir_expand::{
99
name::{name, AsName},
1010
};
1111
use intern::Interned;
12-
use syntax::ast::{self, AstNode, HasTypeBounds};
12+
use syntax::ast::{self, AstNode, HasGenericArgs, HasTypeBounds};
1313

1414
use crate::{
1515
path::{AssociatedTypeBinding, GenericArg, GenericArgs, ModPath, Path, PathKind},

src/tools/rust-analyzer/crates/ide-assists/src/handlers/add_turbo_fish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use either::Either;
22
use ide_db::defs::{Definition, NameRefClass};
33
use syntax::{
4-
ast::{self, make, HasArgList},
4+
ast::{self, make, HasArgList, HasGenericArgs},
55
ted, AstNode,
66
};
77

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_from_to_tryfrom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use ide_db::{famous_defs::FamousDefs, traits::resolve_target_trait};
22
use itertools::Itertools;
33
use syntax::{
4-
ast::{self, make, AstNode, HasName},
4+
ast::{self, make, AstNode, HasGenericArgs, HasName},
55
ted,
66
};
77

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_into_to_from.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use hir::ImportPathConfig;
22
use ide_db::{famous_defs::FamousDefs, helpers::mod_path_to_ast, traits::resolve_target_trait};
3-
use syntax::ast::{self, AstNode, HasName};
3+
use syntax::ast::{self, AstNode, HasGenericArgs, HasName};
44

55
use crate::{AssistContext, AssistId, AssistKind, Assists};
66

src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_type_alias.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use either::Either;
22
use ide_db::syntax_helpers::node_ext::walk_ty;
33
use syntax::{
4-
ast::{self, edit::IndentLevel, make, AstNode, HasGenericParams, HasName},
4+
ast::{self, edit::IndentLevel, make, AstNode, HasGenericArgs, HasGenericParams, HasName},
55
ted,
66
};
77

src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_delegate_trait.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ use syntax::{
1717
self,
1818
edit::{self, AstNodeEdit},
1919
edit_in_place::AttrsOwnerEdit,
20-
make, AssocItem, GenericArgList, GenericParamList, HasAttrs, HasGenericParams, HasName,
21-
HasTypeBounds, HasVisibility as astHasVisibility, Path, WherePred,
20+
make, AssocItem, GenericArgList, GenericParamList, HasAttrs, HasGenericArgs,
21+
HasGenericParams, HasName, HasTypeBounds, HasVisibility as astHasVisibility, Path,
22+
WherePred,
2223
},
2324
ted::{self, Position},
2425
AstNode, NodeOrToken, SmolStr, SyntaxKind,

src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_documentation_template.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use itertools::Itertools;
44
use stdx::{format_to, to_lower_snake_case};
55
use syntax::{
66
algo::skip_whitespace_token,
7-
ast::{self, edit::IndentLevel, HasDocComments, HasName},
7+
ast::{self, edit::IndentLevel, HasDocComments, HasGenericArgs, HasName},
88
match_ast, AstNode, AstToken,
99
};
1010

src/tools/rust-analyzer/crates/ide-assists/src/handlers/inline_call.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ use ide_db::{
1515
};
1616
use itertools::{izip, Itertools};
1717
use syntax::{
18-
ast::{self, edit::IndentLevel, edit_in_place::Indent, HasArgList, Pat, PathExpr},
18+
ast::{
19+
self, edit::IndentLevel, edit_in_place::Indent, HasArgList, HasGenericArgs, Pat, PathExpr,
20+
},
1921
ted, AstNode, NodeOrToken, SyntaxKind,
2022
};
2123

0 commit comments

Comments
 (0)