implemented fix for issue 5249

src/chains.rs

@@ -67,14 +67,15 @@ use crate::config::{IndentStyle, StyleEdition};
 use crate::expr::rewrite_call;
 use crate::lists::extract_pre_comment;
 use crate::macros::convert_try_mac;
+use crate::overflow;
 use crate::rewrite::{
     ExceedsMaxWidthError, Rewrite, RewriteContext, RewriteError, RewriteErrorExt, RewriteResult,
 };
 use crate::shape::Shape;
 use crate::source_map::SpanUtils;
 use crate::utils::{
-    self, filtered_str_fits, first_line_width, last_line_extendable, last_line_width, mk_sp,
-    rewrite_ident, trimmed_last_line_width, wrap_str,
+    self, extra_offset, filtered_str_fits, first_line_width, last_line_extendable, last_line_width,
+    mk_sp, rewrite_ident, trimmed_last_line_width, wrap_str,
 };
 
 use thin_vec::ThinVec;
@@ -342,18 +343,31 @@ impl ChainItem {
         context: &RewriteContext<'_>,
         shape: Shape,
     ) -> RewriteResult {
-        let type_str = if types.is_empty() {
-            String::new()
-        } else {
-            let type_list = types
-                .iter()
-                .map(|ty| ty.rewrite_result(context, shape))
-                .collect::<Result<Vec<_>, RewriteError>>()?;
+        let mut callee_str = String::with_capacity(128);
 
-            format!("::<{}>", type_list.join(", "))
-        };
-        let callee_str = format!(".{}{}", rewrite_ident(context, method_name), type_str);
-        rewrite_call(context, &callee_str, &args, span, shape)
+        // Add the method name to get the remaining space.
+        callee_str.push('.');
+        callee_str.push_str(rewrite_ident(context, method_name));
+
+        // issue 5249: Since function calls wrap their generics already, this
+        // minimcs the code found in `types::rewrite_generic_args`.
+        if !types.is_empty() {
+            callee_str.push_str("::");
+
+            // An extra offset for the opening '('.
+            let extra_offset = extra_offset(&callee_str, shape) + 1;
+            let new_shape = shape.shrink_left(extra_offset, span)?;
+
+            // This will break up the generics if needed.
+            let generics =
+                overflow::rewrite_with_angle_brackets(context, "", types.iter(), new_shape, span);
+
+            debug!("generics: {:?}", generics);
+
+            callee_str.push_str(&generics?);
+        }
+
+        rewrite_call(context, &callee_str, args, span, shape)
     }
 }
 

src/overflow.rs

@@ -77,6 +77,7 @@ const SPECIAL_CASE_ATTR: &[(&str, usize)] = &[
 pub(crate) enum OverflowableItem<'a> {
     Expr(&'a ast::Expr),
     GenericParam(&'a ast::GenericParam),
+    GenericArg(&'a ast::GenericArg),
     MacroArg(&'a MacroArg),
     MetaItemInner(&'a ast::MetaItemInner),
     SegmentParam(&'a SegmentParam<'a>),
@@ -122,6 +123,7 @@ impl<'a> OverflowableItem<'a> {
         match self {
             OverflowableItem::Expr(expr) => f(*expr),
             OverflowableItem::GenericParam(gp) => f(*gp),
+            OverflowableItem::GenericArg(gp) => f(*gp),
             OverflowableItem::MacroArg(macro_arg) => f(*macro_arg),
             OverflowableItem::MetaItemInner(nmi) => f(*nmi),
             OverflowableItem::SegmentParam(sp) => f(*sp),
@@ -259,6 +261,7 @@ macro_rules! impl_into_overflowable_item_for_rustfmt_types {
 impl_into_overflowable_item_for_ast_node!(
     Expr,
     GenericParam,
+    GenericArg,
     MetaItemInner,
     FieldDef,
     Ty,

tests/source/issue-5249/issue_5249.rs

@@ -0,0 +1,14 @@
+fn long_generic_args_list() {
+    x.f::<
+        A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A,
+                        A, A, A, A, A, A, A, A, A, A, A, A,
+    >();
+}
+
+fn long_items_in_generic_args_list() {
+    x.f::<
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+            AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>
+        >();
+}

tests/source/issue-5249/multi_chain_method_call.rs

@@ -0,0 +1,53 @@
+fn chained_method_calls_short_generic_args_list_long_method_args_list() {
+    x.f::<A, B, C>(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE).g::<A, B, C>(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_inline_comments() {
+    x.f::<
+        A, // Something about arg A
+        B,
+        C,
+    >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE).g::<
+        A, // Something about arg A
+        B,
+        C,
+    >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_inline_comments_in_both_lists(
+) {
+    x.f::<
+        A, // Something about arg A
+        B,
+        C,
+    >(
+        AAAAAAAA, BBBBBBBBB, // Something about arg BBBBBBBBB
+        CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    ).g::<
+        A, // Something about arg A
+        B,
+        C,
+    >(
+        AAAAAAAA, BBBBBBBBB, // Something about arg BBBBBBBBB
+        CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    );
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_block_comments() {
+    x.f::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    ).g::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    );
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_block_comments_in_both_lists(
+) {
+    x.f::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, /* Something about arg BBBBBBBBB */ CCCCCCCCC, DDDDDDDDDD,
+        EEEEEEEEEE,
+    ).g::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, /* Something about arg BBBBBBBBB */ CCCCCCCCC, DDDDDDDDDD,
+        EEEEEEEEEE,
+    );
+}

tests/source/issue-5249/single_line_generic_args.rs

@@ -0,0 +1,20 @@
+fn short_generic_args_list() {
+    x.f::<
+        A,
+        B, C
+        >();
+}
+
+fn short_generic_args_list_with_inline_comments() {
+    x.f::<
+        A, // Something about arg A
+        B, C
+        >();
+}
+
+fn short_generic_args_list_with_block_comments() {
+    x.f::<
+        A, /* Something about arg A */
+        B, C
+        >();
+}

tests/source/issue-5249/with_comments.rs

@@ -0,0 +1,54 @@
+fn long_items_in_generic_args_list_inline_comment() {
+    x.f::<
+        // Pre comment
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>, // Inline
+            AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        // Post Comment
+    >();
+}
+
+fn long_items_in_generic_args_list_multi_line_inline_comment() {
+    x.f::<
+        // Pre comment
+        // Pre comment
+        // Pre comment
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>, // Inline
+        // Inline
+        // Inline
+            AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        // Post Comment
+        // Post Comment
+        // Post Comment
+    >();
+}
+
+fn long_items_in_generic_args_list_block_comment() {
+    x.f::<
+        /* Pre comment */
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>, /* Inline */
+            AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        /* Post Comment */
+    >();
+}
+
+fn long_items_in_generic_args_list_multi_line_block_comment() {
+    x.f::<
+        /* Pre comment
+         * Pre comment
+         * Pre comment
+         */
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>, /* Inline
+        * Inline
+        * Inline
+        */
+            AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        /* Post Comment
+         * Post Comment
+         * Post Comment
+         */
+    >();
+}

tests/source/issue-5249/with_method_arguments.rs

@@ -0,0 +1,35 @@
+fn short_generic_args_list_long_method_args_list() {
+    x.f::<
+        A,
+        B, C
+        >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn short_generic_args_list_long_method_args_list_with_inline_comments() {
+    x.f::<
+        A, // Something about arg A
+        B, C
+        >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn short_generic_args_list_long_method_args_list_with_inline_comments_in_both_lists() {
+    x.f::<
+        A, // Something about arg A
+        B, C
+        >(AAAAAAAA, BBBBBBBBB, // Something about arg BBBBBBBBB
+            CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn short_generic_args_list_long_method_args_list_with_block_comments() {
+    x.f::<
+        A, /* Something about arg A */
+        B, C
+        >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn short_generic_args_list_long_method_args_list_with_block_comments_in_both_lists() {
+    x.f::<
+        A, /* Something about arg A */
+        B, C
+        >(AAAAAAAA, BBBBBBBBB, /* Something about arg BBBBBBBBB */ CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}

tests/source/issue_3191.rs

@@ -0,0 +1,3 @@
+fn foo() {
+    unprivileged_content.start_all::<script_layout_interface::message::Msg, layout_thread::LayoutThread, script::script_thread::ScriptThread>(true);
+}

tests/source/issue_5657.rs

@@ -0,0 +1,13 @@
+// rustfmt-max_width: 80
+
+fn omg() {
+fn bar() {
+self.core
+.exchange::<LeaseBufReader<_, BUFSIZ>, _, LeaseBufWriter<_, BUFSIZ>, _>(
+device_index,
+src,
+dest,
+)
+.map_err(RequestError::from)
+}
+}

tests/target/issue-5249/issue_5249.rs

@@ -0,0 +1,42 @@
+fn long_generic_args_list() {
+    x.f::<
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+        A,
+    >();
+}
+
+fn long_items_in_generic_args_list() {
+    x.f::<
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+        AAAA<BBBB::CCCC, (DDDD, EEEE), FFFF>,
+    >();
+}

tests/target/issue-5249/multi_chain_method_call.rs

@@ -0,0 +1,58 @@
+fn chained_method_calls_short_generic_args_list_long_method_args_list() {
+    x.f::<A, B, C>(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE)
+        .g::<A, B, C>(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_inline_comments() {
+    x.f::<
+        A, // Something about arg A
+        B,
+        C,
+    >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE)
+        .g::<
+            A, // Something about arg A
+            B,
+            C,
+        >(AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE);
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_inline_comments_in_both_lists(
+) {
+    x.f::<
+        A, // Something about arg A
+        B,
+        C,
+    >(
+        AAAAAAAA, BBBBBBBBB, // Something about arg BBBBBBBBB
+        CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    )
+    .g::<
+        A, // Something about arg A
+        B,
+        C,
+    >(
+        AAAAAAAA, BBBBBBBBB, // Something about arg BBBBBBBBB
+        CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    );
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_block_comments() {
+    x.f::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    )
+    .g::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, CCCCCCCCC, DDDDDDDDDD, EEEEEEEEEE,
+    );
+}
+
+fn chained_method_calls_short_generic_args_list_long_method_args_list_with_block_comments_in_both_lists(
+) {
+    x.f::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, /* Something about arg BBBBBBBBB */ CCCCCCCCC, DDDDDDDDDD,
+        EEEEEEEEEE,
+    )
+    .g::<A /* Something about arg A */, B, C>(
+        AAAAAAAA, BBBBBBBBB, /* Something about arg BBBBBBBBB */ CCCCCCCCC, DDDDDDDDDD,
+        EEEEEEEEEE,
+    );
+}