nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring exsisting filter_maps to maps

Browse Source
This commit is contained in:
Jacob Clark 2016-06-07 00:03:25 +01:00
parent 2ea99869a7
commit 77edbb7def
No known key found for this signature in database
GPG Key ID: D77F08FC8050BD8B
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/items.rs
View File

@ -1055,9 +1055,10 @@ pub fn rewrite_associated_type(ident: ast::Ident,
let type_bounds_str = if let Some(ty_param_bounds) = ty_param_bounds_opt {
let bounds: &[_] = &ty_param_bounds;
let bound_str = bounds.iter()
.filter_map(|ty_bound| ty_bound.rewrite(context, context.config.max_width, indent))
.join(" + ");
let bound_str = try_opt!(bounds.iter()
.map(|ty_bound| ty_bound.rewrite(context, context.config.max_width, indent))
.intersperse(Some(" + ".to_string()))
.collect::<Option<String>>());
if bounds.len() > 0 {
format!(": {}", bound_str)
} else {
@ -1700,9 +1701,10 @@ fn rewrite_trait_bounds(context: &RewriteContext,
return Some(String::new());
}
let bound_str = bounds.iter()
.filter_map(|ty_bound| ty_bound.rewrite(&context, width, indent))
.join(" + ");
let bound_str = try_opt!(bounds.iter()
.map(|ty_bound| ty_bound.rewrite(&context, width, indent))
.intersperse(Some(" + ".to_string()))
.collect::<Option<String>>());
let mut result = String::new();
result.push_str(": ");

20
src/types.rs
View File

@ -326,40 +326,40 @@ impl Rewrite for ast::WherePredicate {
let type_str = try_opt!(bounded_ty.rewrite(context, width, offset));
if !bound_lifetimes.is_empty() {
let lifetime_str = try_opt!(bound_lifetimes.iter()
let lifetime_str: String = try_opt!(bound_lifetimes.iter()
.map(|lt| {
lt.rewrite(context,
width,
offset)
})
.intersperse(Some(", ".to_string()))
.collect::<Option<String>>());
.collect());
// 8 = "for<> : ".len()
let used_width = lifetime_str.len() + type_str.len() + 8;
let budget = try_opt!(width.checked_sub(used_width));
let bounds_str = try_opt!(bounds.iter()
let bounds_str: String = try_opt!(bounds.iter()
.map(|ty_bound| {
ty_bound.rewrite(context,
budget,
offset + used_width)
})
.intersperse(Some(" + ".to_string()))
.collect::<Option<String>>());
.collect());
format!("for<{}> {}: {}", lifetime_str, type_str, bounds_str)
} else {
// 2 = ": ".len()
let used_width = type_str.len() + 2;
let budget = try_opt!(width.checked_sub(used_width));
let bounds_str = try_opt!(bounds.iter()
let bounds_str: String = try_opt!(bounds.iter()
.map(|ty_bound| {
ty_bound.rewrite(context,
budget,
offset + used_width)
})
.intersperse(Some(" + ".to_string()))
.collect::<Option<String>>());
.collect());
format!("{}: {}", type_str, bounds_str)
}
@ -451,11 +451,11 @@ impl Rewrite for ast::TyParam {
if !self.bounds.is_empty() {
result.push_str(": ");
let bounds = try_opt!(self.bounds
let bounds: String = try_opt!(self.bounds
.iter()
.map(|ty_bound| ty_bound.rewrite(context, width, offset))
.intersperse(Some(" + ".to_string()))
.collect::<Option<String>>());
.collect());
result.push_str(&bounds);
}
@ -478,11 +478,11 @@ impl Rewrite for ast::TyParam {
impl Rewrite for ast::PolyTraitRef {
fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
if !self.bound_lifetimes.is_empty() {
let lifetime_str = try_opt!(self.bound_lifetimes
let lifetime_str: String = try_opt!(self.bound_lifetimes
.iter()
.map(|lt| lt.rewrite(context, width, offset))
.intersperse(Some(", ".to_string()))
.collect::<Option<String>>());
.collect());
// 6 is "for<> ".len()
let extra_offset = lifetime_str.len() + 6;