]> git.lizzy.rs Git - rust.git/commitdiff
Merge pull request #1326 from durka/assoc-type-density
authorNick Cameron <nrc@ncameron.org>
Thu, 23 Feb 2017 02:00:47 +0000 (15:00 +1300)
committerGitHub <noreply@github.com>
Thu, 23 Feb 2017 02:00:47 +0000 (15:00 +1300)
honor type_punctuation_density for assoc. types

1  2 
src/types.rs

diff --cc src/types.rs
index 5fbf4a7e15051a6b9efd233921f3945b57d73fe4,b9404e7727b239e691e5f80bd57a721349816e31..7f6e8e68576356b6276e8581b245bc600fed6a4c
@@@ -160,12 -161,13 +160,15 @@@ impl<'a> Rewrite for SegmentParam<'a> 
              SegmentParam::LifeTime(lt) => lt.rewrite(context, shape),
              SegmentParam::Type(ty) => ty.rewrite(context, shape),
              SegmentParam::Binding(binding) => {
-                 let mut result = format!("{} = ", binding.ident);
+                 let mut result = match context.config.type_punctuation_density {
+                     TypeDensity::Wide => format!("{} = ", binding.ident),
+                     TypeDensity::Compressed => format!("{}=", binding.ident),
+                 };
                  let budget = try_opt!(shape.width.checked_sub(result.len()));
 -                let rewrite = try_opt!(binding.ty
 -                    .rewrite(context, Shape::legacy(budget, shape.indent + result.len())));
 +                let rewrite =
 +                    try_opt!(binding.ty
 +                                 .rewrite(context,
 +                                          Shape::legacy(budget, shape.indent + result.len())));
                  result.push_str(&rewrite);
                  Some(result)
              }