Merge pull request #1586 from topecongiro/minor

Fix minor bugs

1 files changed, 5 insertions, 7 deletions

diff --git a/src/expr.rs b/src/expr.rs
index 4a415a5cc82..318ec8e59b5 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -1887,13 +1887,11 @@ fn rewrite_index(expr: &ast::Expr,
         ("[", "]")
     };
 
-    let budget = shape
-        .width
-        .checked_sub(expr_str.len() + lbr.len() + rbr.len())
-        .unwrap_or(0);
-    let index_str = index.rewrite(context, Shape::legacy(budget, shape.indent));
-    if let Some(index_str) = index_str {
-        return Some(format!("{}{}{}{}", expr_str, lbr, index_str, rbr));
+    let offset = expr_str.len() + lbr.len();
+    if let Some(index_shape) = shape.visual_indent(offset).sub_width(offset + rbr.len()) {
+        if let Some(index_str) = index.rewrite(context, index_shape) {
+            return Some(format!("{}{}{}{}", expr_str, lbr, index_str, rbr));
+        }
     }
 
     let indent = shape.indent.block_indent(&context.config);