aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-09-03 11:23:08 +0100
committerGitHub <[email protected]>2020-09-03 11:23:08 +0100
commita000346ab2c5851b65eca601996933ba611d2d32 (patch)
tree131e97cbfb00a05592e3b2f50f27154b56cbb0e8 /crates
parentd2c3832a8a95b7f00c201f1c98335412ff845afb (diff)
parent75b1f9ee23e1702901d08707689690308d74953d (diff)
Merge #5941
5941: Unify naming r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/assists/src/ast_transform.rs2
-rw-r--r--crates/syntax/src/ast/edit.rs8
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs
index 5216862ba..bbcd2d488 100644
--- a/crates/assists/src/ast_transform.rs
+++ b/crates/assists/src/ast_transform.rs
@@ -166,7 +166,7 @@ impl<'a> QualifyPaths<'a> {
166 .map(|arg_list| apply(self, arg_list)); 166 .map(|arg_list| apply(self, arg_list));
167 if let Some(type_args) = type_args { 167 if let Some(type_args) = type_args {
168 let last_segment = path.segment().unwrap(); 168 let last_segment = path.segment().unwrap();
169 path = path.with_segment(last_segment.with_type_args(type_args)) 169 path = path.with_segment(last_segment.with_generic_args(type_args))
170 } 170 }
171 171
172 Some(path.syntax().clone()) 172 Some(path.syntax().clone())
diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index 060b20966..823475333 100644
--- a/crates/syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
@@ -260,16 +260,16 @@ impl ast::Path {
260 260
261impl ast::PathSegment { 261impl ast::PathSegment {
262 #[must_use] 262 #[must_use]
263 pub fn with_type_args(&self, type_args: ast::GenericArgList) -> ast::PathSegment { 263 pub fn with_generic_args(&self, type_args: ast::GenericArgList) -> ast::PathSegment {
264 self._with_type_args(type_args, false) 264 self._with_generic_args(type_args, false)
265 } 265 }
266 266
267 #[must_use] 267 #[must_use]
268 pub fn with_turbo_fish(&self, type_args: ast::GenericArgList) -> ast::PathSegment { 268 pub fn with_turbo_fish(&self, type_args: ast::GenericArgList) -> ast::PathSegment {
269 self._with_type_args(type_args, true) 269 self._with_generic_args(type_args, true)
270 } 270 }
271 271
272 fn _with_type_args(&self, type_args: ast::GenericArgList, turbo: bool) -> ast::PathSegment { 272 fn _with_generic_args(&self, type_args: ast::GenericArgList, turbo: bool) -> ast::PathSegment {
273 if let Some(old) = self.generic_arg_list() { 273 if let Some(old) = self.generic_arg_list() {
274 return self.replace_children( 274 return self.replace_children(
275 single_node(old.syntax().clone()), 275 single_node(old.syntax().clone()),