Merge from rust-lang#4886

Author: chachako

src/config/mod.rs

@@ -140,6 +140,9 @@ create_config! {
     inline_attribute_width: usize, 0, false,
         "Write an item and its attribute on the same line \
         if their combined width is below a threshold";
+    righthand_indentation_strategy: RightHandIndentationStrategy,
+        RightHandIndentationStrategy::Heuristic, false,
+        "Determines how the right-hand side of an assignment and pattern is indented.";
     format_generated_files: bool, true, false, "Format generated files";
 
     // Options that can change the source code beyond whitespace/blocks (somewhat linty things)
@@ -611,6 +614,7 @@ blank_lines_lower_bound = 0
 edition = "2015"
 version = "One"
 inline_attribute_width = 0
+righthand_indentation_strategy = "SameLineAsLHS"
 format_generated_files = true
 merge_derives = true
 use_try_shorthand = false