|
 |
26cb86 |
From 49bf49b99a7ffb12b68035f096c160bc51e48775 Mon Sep 17 00:00:00 2001
|
|
|
26cb86 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
26cb86 |
Date: Thu, 21 Nov 2019 09:22:33 +0100
|
|
|
26cb86 |
Subject: [PATCH] Use system Object::HashBase
|
|
|
26cb86 |
MIME-Version: 1.0
|
|
|
26cb86 |
Content-Type: text/plain; charset=UTF-8
|
|
|
26cb86 |
Content-Transfer-Encoding: 8bit
|
|
|
26cb86 |
|
|
|
26cb86 |
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
|
|
26cb86 |
---
|
|
|
26cb86 |
Makefile.PL | 1 +
|
|
|
26cb86 |
lib/Term/Table.pm | 2 +-
|
|
|
26cb86 |
lib/Term/Table/Cell.pm | 2 +-
|
|
|
26cb86 |
lib/Term/Table/CellStack.pm | 2 +-
|
|
|
26cb86 |
lib/Term/Table/LineBreak.pm | 2 +-
|
|
|
26cb86 |
5 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
26cb86 |
|
|
|
26cb86 |
diff --git a/Makefile.PL b/Makefile.PL
|
|
|
26cb86 |
index 44de066..4d4c7d4 100644
|
|
|
26cb86 |
--- a/Makefile.PL
|
|
|
26cb86 |
+++ b/Makefile.PL
|
|
|
26cb86 |
@@ -20,6 +20,7 @@ my %WriteMakefileArgs = (
|
|
|
26cb86 |
"Carp" => 0,
|
|
|
26cb86 |
"Importer" => "0.024",
|
|
|
26cb86 |
"List::Util" => 0,
|
|
|
26cb86 |
+ "Object::HashBase" => "0.008",
|
|
|
26cb86 |
"Scalar::Util" => 0
|
|
|
26cb86 |
},
|
|
|
26cb86 |
"TEST_REQUIRES" => {
|
|
|
26cb86 |
diff --git a/lib/Term/Table.pm b/lib/Term/Table.pm
|
|
|
26cb86 |
index 578eba8..3190bcd 100644
|
|
|
26cb86 |
--- a/lib/Term/Table.pm
|
|
|
26cb86 |
+++ b/lib/Term/Table.pm
|
|
|
26cb86 |
@@ -11,7 +11,7 @@ use Scalar::Util qw/blessed/;
|
|
|
26cb86 |
use List::Util qw/max sum/;
|
|
|
26cb86 |
use Carp qw/croak carp/;
|
|
|
26cb86 |
|
|
|
26cb86 |
-use Term::Table::HashBase qw/rows _columns collapse max_width mark_tail sanitize show_header auto_columns no_collapse header allow_overflow pad/;
|
|
|
26cb86 |
+use Object::HashBase 0.008 qw/rows _columns collapse max_width mark_tail sanitize show_header auto_columns no_collapse header allow_overflow pad/;
|
|
|
26cb86 |
|
|
|
26cb86 |
sub BORDER_SIZE() { 4 } # '| ' and ' |' borders
|
|
|
26cb86 |
sub DIV_SIZE() { 3 } # ' | ' column delimiter
|
|
|
26cb86 |
diff --git a/lib/Term/Table/Cell.pm b/lib/Term/Table/Cell.pm
|
|
|
26cb86 |
index 978ef06..10d2b70 100644
|
|
|
26cb86 |
--- a/lib/Term/Table/Cell.pm
|
|
|
26cb86 |
+++ b/lib/Term/Table/Cell.pm
|
|
|
26cb86 |
@@ -9,7 +9,7 @@ use Term::Table::Util qw/uni_length/;
|
|
|
26cb86 |
|
|
|
26cb86 |
use List::Util qw/sum/;
|
|
|
26cb86 |
|
|
|
26cb86 |
-use Term::Table::HashBase qw/value border_left border_right _break _widths border_color value_color reset_color/;
|
|
|
26cb86 |
+use Object::HashBase 0.008 qw/value border_left border_right _break _widths border_color value_color reset_color/;
|
|
|
26cb86 |
|
|
|
26cb86 |
my %CHAR_MAP = (
|
|
|
26cb86 |
# Special case, \n should render as \n, but also actually do the newline thing
|
|
|
26cb86 |
diff --git a/lib/Term/Table/CellStack.pm b/lib/Term/Table/CellStack.pm
|
|
|
26cb86 |
index 7b99f6a..a948d10 100644
|
|
|
26cb86 |
--- a/lib/Term/Table/CellStack.pm
|
|
|
26cb86 |
+++ b/lib/Term/Table/CellStack.pm
|
|
|
26cb86 |
@@ -4,7 +4,7 @@ use warnings;
|
|
|
26cb86 |
|
|
|
26cb86 |
our $VERSION = '0.015';
|
|
|
26cb86 |
|
|
|
26cb86 |
-use Term::Table::HashBase qw/-cells -idx/;
|
|
|
26cb86 |
+use Object::HashBase 0.008 qw/-cells -idx/;
|
|
|
26cb86 |
|
|
|
26cb86 |
use List::Util qw/max/;
|
|
|
26cb86 |
|
|
|
26cb86 |
diff --git a/lib/Term/Table/LineBreak.pm b/lib/Term/Table/LineBreak.pm
|
|
|
26cb86 |
index dc70ca3..ef95f7e 100644
|
|
|
26cb86 |
--- a/lib/Term/Table/LineBreak.pm
|
|
|
26cb86 |
+++ b/lib/Term/Table/LineBreak.pm
|
|
|
26cb86 |
@@ -8,7 +8,7 @@ use Carp qw/croak/;
|
|
|
26cb86 |
use Scalar::Util qw/blessed/;
|
|
|
26cb86 |
use Term::Table::Util qw/uni_length/;
|
|
|
26cb86 |
|
|
|
26cb86 |
-use Term::Table::HashBase qw/string gcstring _len _parts idx/;
|
|
|
26cb86 |
+use Object::HashBase 0.008 qw/string gcstring _len _parts idx/;
|
|
|
26cb86 |
|
|
|
26cb86 |
sub init {
|
|
|
26cb86 |
my $self = shift;
|
|
|
26cb86 |
--
|
|
|
26cb86 |
2.21.0
|
|
|
26cb86 |
|