Merge pull request #1904 from spinda/assoc-types-bounds-fix

Fix wrapping of bounds in associated types

src/items.rs

@@ -1551,7 +1551,8 @@ pub fn rewrite_associated_type(
     let prefix = format!("type {}", ident);
 
     let type_bounds_str = if let Some(ty_param_bounds) = ty_param_bounds_opt {
-        let shape = Shape::indented(indent, context.config);
+        // 2 = ": ".len()
+        let shape = try_opt!(Shape::indented(indent, context.config).offset_left(prefix.len() + 2));
         let bounds: &[_] = ty_param_bounds;
         let bound_str = try_opt!(
             bounds

tests/source/associated-types-bounds-wrapping.rs

@@ -0,0 +1,6 @@
+// rustfmt-max_width: 100
+// Test proper wrapping of long associated type bounds
+
+pub trait HttpService {
+    type WsService: 'static + Service<Request = WsCommand, Response = WsResponse, Error = ServerError>;
+}

tests/target/associated-types-bounds-wrapping.rs

@@ -0,0 +1,7 @@
+// rustfmt-max_width: 100
+// Test proper wrapping of long associated type bounds
+
+pub trait HttpService {
+    type WsService: 'static
+        + Service<Request = WsCommand, Response = WsResponse, Error = ServerError>;
+}