aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide/src/display/function_signature.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_ide/src/display/function_signature.rs')
-rw-r--r--crates/ra_ide/src/display/function_signature.rs18
1 files changed, 8 insertions, 10 deletions
diff --git a/crates/ra_ide/src/display/function_signature.rs b/crates/ra_ide/src/display/function_signature.rs
index ec1bbd5a0..b967a6816 100644
--- a/crates/ra_ide/src/display/function_signature.rs
+++ b/crates/ra_ide/src/display/function_signature.rs
@@ -1,12 +1,14 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3use std::fmt::{self, Display}; 3use std::{
4 convert::From,
5 fmt::{self, Display},
6};
4 7
5use hir::{Docs, Documentation, HasSource, HirDisplay}; 8use hir::{Docs, Documentation, HasSource, HirDisplay};
6use join_to_string::join;
7use ra_ide_db::RootDatabase; 9use ra_ide_db::RootDatabase;
8use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner}; 10use ra_syntax::ast::{self, AstNode, NameOwner, VisibilityOwner};
9use std::convert::From; 11use stdx::SepBy;
10 12
11use crate::display::{generic_parameters, where_predicates}; 13use crate::display::{generic_parameters, where_predicates};
12 14
@@ -227,21 +229,17 @@ impl Display for FunctionSignature {
227 } 229 }
228 230
229 if !self.generic_parameters.is_empty() { 231 if !self.generic_parameters.is_empty() {
230 join(self.generic_parameters.iter()) 232 write!(f, "{}", self.generic_parameters.iter().sep_by(", ").surround_with("<", ">"))?;
231 .separator(", ")
232 .surround_with("<", ">")
233 .to_fmt(f)?;
234 } 233 }
235 234
236 join(self.parameters.iter()).separator(", ").surround_with("(", ")").to_fmt(f)?; 235 write!(f, "{}", self.parameters.iter().sep_by(", ").surround_with("(", ")"))?;
237 236
238 if let Some(t) = &self.ret_type { 237 if let Some(t) = &self.ret_type {
239 write!(f, " -> {}", t)?; 238 write!(f, " -> {}", t)?;
240 } 239 }
241 240
242 if !self.where_predicates.is_empty() { 241 if !self.where_predicates.is_empty() {
243 write!(f, "\nwhere ")?; 242 write!(f, "\nwhere {}", self.where_predicates.iter().sep_by(",\n "))?;
244 join(self.where_predicates.iter()).separator(",\n ").to_fmt(f)?;
245 } 243 }
246 244
247 Ok(()) 245 Ok(())