Merge pull request #178 from marcusklaas/single-config-override

Allow override of single configuration lines in tests

1 files changed, 2 insertions, 4 deletions

diff --git a/src/expr.rs b/src/expr.rs
index 1dfff001475..2fbdcb7d6c9 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -617,10 +617,8 @@ fn rewrite_binary_op(context: &RewriteContext,
     let operator_str = context.codemap.span_to_snippet(op.span).unwrap();
 
     // 1 = space between lhs expr and operator
-    let mut result =
-        try_opt!(lhs.rewrite(context,
-                             context.config.max_width - offset - 1 - operator_str.len(),
-                             offset));
+    let max_width = try_opt!(context.config.max_width.checked_sub(operator_str.len() + offset + 1));
+    let mut result = try_opt!(lhs.rewrite(context, max_width, offset));
 
     result.push(' ');
     result.push_str(&operator_str);