Revert the removal of 'use encoding'

We've decided to not remove 'use encoding' in v5.20.

This reverts commits b017fe877ad78f04afaa3c1327fc46391f572bfb,
7053d92917f7cb46452de86dc4c6d8644cae849c, and
b06e47f717f77453fbdaef628efc2b9c83898a8b

10 files changed, 2 insertions, 14 deletions

diff --git a/t/op/concat2.t b/t/op/concat2.t
index 46ec02e62f..9dfcc5b1d7 100644
--- a/t/op/concat2.t
+++ b/t/op/concat2.t
@@ -14,7 +14,6 @@ BEGIN {
 plan 3;
 
 SKIP: {
-skip("XXX 'use encoding' is gone.  This test needs to be rewritten", 1);
 skip_if_miniperl("no dynamic loading on miniperl, no Encode", 1);
 fresh_perl_is <<'end', "ok\n", {},
     no warnings 'deprecated';
diff --git a/t/porting/customized.dat b/t/porting/customized.dat
index b63e753cff..47d977b7c5 100644
--- a/t/porting/customized.dat
+++ b/t/porting/customized.dat
@@ -18,9 +18,3 @@ podlators cpan/podlators/scripts/pod2text.PL b4693fcfe4a0a1b38a215cfb8985a65d5d0
 version cpan/version/lib/version.pm fa9931d4db05aff9a0a6ef558610b1a472d9306e
 version vutil.c abd88f59a6e0cfe7b4e45b1859f414042ea254aa
 version vxs.inc 9064aacbdfe42bb584a068f62b505dd11dbb4dc4
-Encode cpan/Encode/encoding.pm 4dc8e5e81f7b13e185d453c0ac704a07d625f190
-Encode cpan/Encode/t/enc_data.t 82e46d0908fdd381ab01b700240050034336a66d
-Encode cpan/Encode/t/enc_eucjp.t 9b386c1ef035f22798b124aa361bfecb833456c0
-Encode cpan/Encode/t/enc_utf8.t 3414490ad30b155241f07e3e3f2079743de16d40
-Encode cpan/Encode/t/encoding.t 4ac06c1f1c1b958c4e4b11304b8372bc94396c11
-Encode cpan/Encode/t/jperl.t 3c21d9c62d1a68dc6da7431f364f8aa4b3e9d040
diff --git a/t/re/pat_advanced.t b/t/re/pat_advanced.t
index d6d14dfd00..302d90ae17 100644
--- a/t/re/pat_advanced.t
+++ b/t/re/pat_advanced.t
@@ -1873,6 +1873,8 @@ EOP
 	   'IsPunct disagrees with [:punct:] outside ASCII');
 
         my @isPunctLatin1 = eval q {
+            no warnings 'deprecated';
+            use encoding 'latin1';
             grep {/[[:punct:]]/ != /\p{IsPunct}/} map {chr} 0x80 .. 0xff;
         };
         skip "Eval failed ($@)", 1 if $@;
diff --git a/t/uni/chr.t b/t/uni/chr.t
index 226f1b7496..9445d32a7b 100644
--- a/t/uni/chr.t
+++ b/t/uni/chr.t
@@ -2,7 +2,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/greek.t b/t/uni/greek.t
index d911a75ca6..5326ab94ad 100644
--- a/t/uni/greek.t
+++ b/t/uni/greek.t
@@ -2,7 +2,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/latin2.t b/t/uni/latin2.t
index 06299db28a..6e7d980aec 100644
--- a/t/uni/latin2.t
+++ b/t/uni/latin2.t
@@ -2,7 +2,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/tr_7jis.t b/t/uni/tr_7jis.t
index 918655b9e8..2108319d47 100644
--- a/t/uni/tr_7jis.t
+++ b/t/uni/tr_7jis.t
@@ -6,7 +6,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/tr_eucjp.t b/t/uni/tr_eucjp.t
index 13ae4e14ca..a317bb17aa 100644
--- a/t/uni/tr_eucjp.t
+++ b/t/uni/tr_eucjp.t
@@ -5,7 +5,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/tr_sjis.t b/t/uni/tr_sjis.t
index b1728260d9..a82b35c469 100644
--- a/t/uni/tr_sjis.t
+++ b/t/uni/tr_sjis.t
@@ -5,7 +5,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();
diff --git a/t/uni/tr_utf8.t b/t/uni/tr_utf8.t
index 01a26bc270..2a566d91b9 100644
--- a/t/uni/tr_utf8.t
+++ b/t/uni/tr_utf8.t
@@ -6,7 +6,6 @@
 
 BEGIN {
     require './test.pl';
-    skip_all("'use encoding' has been removed");
     skip_all_without_dynamic_extension('Encode');
     skip_all("EBCDIC") if $::IS_EBCDIC;
     skip_all_without_perlio();