Disambiguate "Can't locate"

   Message-Id: <E16kolD-0002S0-00@draco.cus.cam.ac.uk>

p4raw-id: //depot/perl@15200

diff --git a/lib/AutoSplit.t b/lib/AutoSplit.t
index 7cc680e..3e92e4b 100644 (file)
--- a/lib/AutoSplit.t
+++ b/lib/AutoSplit.t
@@ -336,7 +336,7 @@ AutoSplitting *INC**PATHSEP**MOD*.pm (*DIR**PATHSEP**MOD*)
 *DIR*/*MOD*/flying_pig.al
 ## Tests
 is (&*MOD*::skeleton, "bones", "skeleton");
-eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate auto/*MOD*/gonner.al in \@INC!, "Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
+eval {&*MOD*::gonner}; ok ($@ =~ m!^Can't locate file auto/*MOD*/gonner.al in \@INC!, "Check &*MOD*::gonner is now a gonner") or print "# \$\@='$@'\n";
 ## Sleep
 4
 ## SameAgain
@@ -408,4 +408,4 @@ AutoSplitting *INC**PATHSEP**MOD*.pm (*DIR**PATHSEP**MOD*)
 *DIR*/*MOD*/wraith.al
 ## Tests
 is (&*MOD*::wraith, 9);
-eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate auto/*MOD*/flying_pig.al in \@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";
+eval {&*MOD*::flying_pig}; ok ($@ =~ m!^Can't locate file auto/*MOD*/flying_pig.al in \@INC!, "There are no flying pigs") or print "# \$\@='$@'\n";

diff --git a/lib/Test/Simple/t/fail-more.t b/lib/Test/Simple/t/fail-more.t
index 29f8eb2..3e3f6b3 100644 (file)
--- a/lib/Test/Simple/t/fail-more.t
+++ b/lib/Test/Simple/t/fail-more.t
@@ -207,10 +207,10 @@ ERR
    my $more_err_re = <<ERR;
 #     Failed test \\($filename at line 84\\)
 #     Tried to use 'Hooble::mooble::yooble'.
-#     Error:  Can't locate Hooble.* in \\\@INC .*
+#     Error:  Can't locate file Hooble.* in \\\@INC .*
 #     Failed test \\($filename at line 85\\)
 #     Tried to require 'ALL::YOUR::BASE::ARE::BELONG::TO::US::wibble'.
-#     Error:  Can't locate ALL.* in \\\@INC .*
+#     Error:  Can't locate file ALL.* in \\\@INC .*
 # Looks like you failed $Total tests of $Total.
 ERR
 

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index c86ed26..b2284aa 100644 (file)
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -785,7 +785,7 @@ handle, because when it goes to restore the old value of whatever $ref
 pointed to after the scope of the local() is finished, it can't be sure
 that $ref will still be a reference.
 
-=item Can't locate %s
+=item Can't locate file %s
 
 (F) You said to C<do> (or C<require>, or C<use>) a file that couldn't be
 found. Perl looks for the file in all the locations mentioned in @INC,

diff --git a/pp_ctl.c b/pp_ctl.c
index 11b3613..9c4479b 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3155,7 +3155,7 @@ PP(pp_require)
                SvREFCNT_dec(dirmsgsv);
                msgstr = SvPV_nolen(msg);
            }
-           DIE(aTHX_ "Can't locate %s", msgstr);
+           DIE(aTHX_ "Can't locate file %s", msgstr);
        }
 
        RETPUSHUNDEF;

diff --git a/t/op/override.t b/t/op/override.t
index 1a4e5e0..e9e62a0 100755 (executable)
--- a/t/op/override.t
+++ b/t/op/override.t
@@ -67,7 +67,7 @@ print "ok 10\n";
     local(*CORE::GLOBAL::require);
     $r = '';
     eval "require NoNeXiSt;";
-    print "not " if $r or $@ !~ /^Can't locate NoNeXiSt/i;
+    print "not " if $r or $@ !~ /^Can't locate file NoNeXiSt/i;
     print "ok 11\n";
 }