Normalize formatting of "Ambiguous call resolved as CORE::%s(), qualify as such or...

diff --git a/t/porting/diag.t b/t/porting/diag.t
index 7c05172..b9517b6 100644 (file)
--- a/t/porting/diag.t
+++ b/t/porting/diag.t
@@ -223,7 +223,6 @@ sub check_file {
 # Lists all missing things as of the inaguration of this script, so we
 # don't have to go from "meh" to perfect all at once.
 __DATA__
-Ambiguous call resolved as CORE::%s(), %s
 Ambiguous use of %c resolved as operator %c
 Ambiguous use of %c{%s} resolved to %c%s
 Ambiguous use of %c{%s%s} resolved to %c%s%s

diff --git a/toke.c b/toke.c
index 75fb327..1e7cdb5 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -6204,8 +6204,9 @@ Perl_yylex(pTHX)
                gvp = 0;
                if (hgv && tmp != KEY_x && tmp != KEY_CORE)     /* never ambiguous */
                    Perl_ck_warner(aTHX_ packWARN(WARN_AMBIGUOUS),
-                                  "Ambiguous call resolved as CORE::%s(), %s",
-                                  GvENAME(hgv), "qualify as such or use &");
+                                  "Ambiguous call resolved as CORE::%s(), "
+                                  "qualify as such or use &",
+                                  GvENAME(hgv));
            }
        }