use List::Util instead of List::MoreUtils

kasei · Jan 10, 2025 · 2f998a2 · 2f998a2
1 parent 7a6d907
commit 2f998a2
Show file tree

Hide file tree

Showing 38 changed files with 55 additions and 58 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -28,7 +28,7 @@ requires		'File::Slurp'				=> 0;
 requires		'HTTP::Negotiate'			=> 0;
 requires		'IRI'						=> 0.005;
 requires		'JSON'						=> 0;
-requires		'List::MoreUtils'			=> 0;
+requires		'List::Util'			=> '1.56';
 requires		'LWP::UserAgent'			=> 0;
 requires		'Math::Cartesian::Product'	=> 1.008;
 requires		'Module::Pluggable'			=> 0;

diff --git a/lib/Attean.pm b/lib/Attean.pm
@@ -76,7 +76,7 @@ package Attean {
 	use Attean::TermMap;
 
 	use HTTP::Negotiate qw(choose);
-	use List::MoreUtils qw(any all);
+	use List::Util qw(any all);
 	use Module::Load::Conditional qw(can_load);
 	use Role::Tiny ();
 	use Sub::Util qw(set_subname);

diff --git a/lib/Attean/API/Binding.pm b/lib/Attean/API/Binding.pm
@@ -73,7 +73,7 @@ use Type::Tiny::Role;
 
 package Attean::API::Binding 0.034 {
 	use Scalar::Util qw(blessed);
-	use List::MoreUtils qw(zip);
+	use List::Util qw(mesh);
 
 	use Moo::Role;
 
@@ -85,7 +85,7 @@ package Attean::API::Binding 0.034 {
 		my $self	= shift;
 		my @k		= $self->variables;
 		my @v		= $self->values;
-		return zip @k, @v;
+		return mesh \@k, \@v;
 	}
 
 	sub values {
@@ -287,7 +287,7 @@ C<< $binding >>.
 
 package Attean::API::TripleOrQuadPattern 0.034 {
 	use Encode qw(encode);
-	use List::MoreUtils qw(zip);
+	use List::Util qw(mesh);
 	use Scalar::Util qw(blessed);
 	use Attean::RDF;
 	use Attean::API::Query;
@@ -461,12 +461,12 @@ parsed from C<< $string >> in SPARQL syntax.
 		unless ($e == $f) {
 			die "${class}->parse found wrong number of nodes (found $f but expecting $e)";
 		}
-		return $self->new(zip @keys, @values);
+		return $self->new(mesh \@keys, \@values);
 	}
 }
 
 package Attean::API::TripleOrQuad 0.034 {
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use Carp;
 
 	use Moo::Role;
@@ -482,7 +482,7 @@ package Attean::API::TripleOrQuad 0.034 {
 }
 
 package Attean::API::TriplePattern 0.034 {
-	use List::MoreUtils qw(zip);
+	use List::Util qw(mesh);
 	use Scalar::Util qw(blessed);
 
 	use Moo::Role;
@@ -501,7 +501,7 @@ package Attean::API::TriplePattern 0.034 {
 		my $graph	= shift;
 		my @keys	= Attean::API::Quad->variables;
 		my @values	= ($self->values, $graph);
-		return Attean::QuadPattern->new(zip @keys, @values);
+		return Attean::QuadPattern->new(mesh \@keys, \@values);
 	}
 
 	sub as_triple {
@@ -633,7 +633,7 @@ package Attean::API::Triple 0.034 {
 
 package Attean::API::QuadPattern 0.034 {
 	use Scalar::Util qw(blessed);
-	use List::MoreUtils qw(zip);
+	use List::Util qw(mesh);
 
 	use Moo::Role;
 
@@ -663,7 +663,7 @@ package Attean::API::QuadPattern 0.034 {
 		my @keys	= Attean::API::Triple->variables;
 		my @values	= $self->values;
 		@values		= @values[0 .. scalar(@keys)-1];
-		return Attean::TriplePattern->new(zip @keys, @values);
+		return Attean::TriplePattern->new(mesh \@keys, \@values);
 	}
 
 	sub sparql_tokens {

diff --git a/lib/Attean/API/Model.pm b/lib/Attean/API/Model.pm
@@ -171,7 +171,7 @@ package Attean::API::Model 0.034 {
 	use Sub::Util qw(set_subname);
 	use URI::Namespace;
 	use Scalar::Util qw(blessed);
-	use List::MoreUtils qw(uniq);
+	use List::Util qw(uniq);
 	use Math::Cartesian::Product;
 	use Data::Dumper;
 

diff --git a/lib/Attean/API/QueryPlanner.pm b/lib/Attean/API/QueryPlanner.pm
@@ -220,7 +220,7 @@ package Attean::API::IDPJoinPlanner 0.034 {
 	use LWP::UserAgent;
 	use Scalar::Util qw(blessed reftype);
 	use List::Util qw(reduce);
-	use List::MoreUtils qw(all any);
+	use List::Util qw(all any);
 	use Types::Standard qw(Int ConsumerOf InstanceOf);
 	use URI::Escape;
 	use Algorithm::Combinatorics qw(subsets);

diff --git a/lib/Attean/Algebra.pm b/lib/Attean/Algebra.pm
@@ -1524,7 +1524,7 @@ package Attean::Algebra::Modify 0.034 {
 	use Scalar::Util qw(blessed);
 	use AtteanX::SPARQL::Constants;
 	use AtteanX::SPARQL::Token;
-	use List::MoreUtils qw(all any);
+	use List::Util qw(all any);
 	use Types::Standard qw(HashRef ArrayRef ConsumerOf);
 	use namespace::clean;
 

diff --git a/lib/Attean/Plan.pm b/lib/Attean/Plan.pm
@@ -141,7 +141,7 @@ Evaluates a join (natural-, anti-, or left-) using a nested loop.
 
 package Attean::Plan::NestedLoopJoin 0.034 {
 	use Moo;
-	use List::MoreUtils qw(all);
+	use List::Util qw(all);
 	use namespace::clean;
 
 	with 'Attean::API::BindingSubstitutionPlan';
@@ -230,7 +230,7 @@ Evaluates a join (natural-, anti-, or left-) using a hash join.
 
 package Attean::Plan::HashJoin 0.034 {
 	use Moo;
-	use List::MoreUtils qw(all);
+	use List::Util qw(all);
 	use namespace::clean;
 
 	sub BUILD {
@@ -371,7 +371,7 @@ package Attean::Plan::HashJoin 0.034 {
 
 package Attean::Plan::Construct 0.034 {
 	use Moo;
-	use List::MoreUtils qw(all);
+	use List::Util qw(all);
 	use Types::Standard qw(Str ArrayRef ConsumerOf InstanceOf);
 	use namespace::clean;
 	has 'triples' => (is => 'ro', 'isa' => ArrayRef[ConsumerOf['Attean::API::TripleOrQuadPattern']], required => 1);
@@ -483,7 +483,7 @@ package Attean::Plan::Construct 0.034 {
 package Attean::Plan::Describe 0.034 {
 	use Moo;
 	use Attean::RDF;
-	use List::MoreUtils qw(all);
+	use List::Util qw(all);
 	use Types::Standard qw(Str ArrayRef ConsumerOf InstanceOf);
 	use namespace::clean;
 
@@ -736,7 +736,7 @@ package Attean::Plan::Extend 0.034 {
 	use Digest::SHA;
 	use Digest::MD5 qw(md5_hex);
 	use Scalar::Util qw(blessed looks_like_number);
-	use List::MoreUtils qw(uniq all);
+	use List::Util qw(uniq all);
 	use Types::Standard qw(ConsumerOf ArrayRef InstanceOf HashRef);
 	use namespace::clean;
 
@@ -2155,7 +2155,7 @@ package Attean::Plan::Aggregate 0.034 {
 	use Digest::SHA;
 	use Digest::MD5 qw(md5_hex);
 	use Scalar::Util qw(blessed);
-	use List::MoreUtils qw(uniq);
+	use List::Util qw(uniq);
 	use Types::Standard qw(ConsumerOf InstanceOf HashRef ArrayRef);
 	use namespace::clean;
 
@@ -2732,7 +2732,7 @@ package Attean::Plan::Unfold 0.032 {
 	use Digest::SHA;
 	use Digest::MD5 qw(md5_hex);
 	use Scalar::Util qw(blessed looks_like_number);
-	use List::MoreUtils qw(uniq all);
+	use List::Util qw(uniq all);
 	use Types::Standard qw(ConsumerOf ArrayRef InstanceOf HashRef);
 	use namespace::clean;
 

diff --git a/lib/Attean/QueryPlanner.pm b/lib/Attean/QueryPlanner.pm
@@ -47,7 +47,7 @@ package Attean::QueryPlanner 0.034 {
 	use Attean::RDF;
 	use Scalar::Util qw(blessed reftype);
 	use List::Util qw(reduce);
-	use List::MoreUtils qw(all any);
+	use List::Util qw(all any);
 	use Types::Standard qw(Int ConsumerOf InstanceOf);
 	use URI::Escape;
 	use Algorithm::Combinatorics qw(subsets);

diff --git a/lib/Attean/RDF.pm b/lib/Attean/RDF.pm
@@ -40,7 +40,7 @@ package Attean::RDF 0.034 {
 	our @EXPORT	= qw(iri blank literal dtliteral langliteral variable triple quad triplepattern quadpattern bgp);
 
 	require Attean;
-	use List::MoreUtils qw(zip);
+	use List::Util qw(mesh);
 	use namespace::clean;
 
 =item C<< variable( $value ) >>
@@ -91,7 +91,7 @@ C<< Attean::Literal->new( value => $value, datatype => $dt ) >>
 
 	sub dtliteral {
 		my @k	= qw(value datatype);
-		return Attean::Literal->new(zip @k, @_);
+		return Attean::Literal->new(mesh \@k, \@_);
 	}
 
 =item C<< langliteral( $value, $lang ) >>
@@ -102,7 +102,8 @@ C<< Attean::Literal->new( value => $value, language => $lang ) >>
 
 	sub langliteral {
 		my @k	= qw(value language);
-		return Attean::Literal->new(zip @k, @_);
+		$DB::single = 1;
+		return Attean::Literal->new(mesh \@k, \@_);
 	}
 
 =item C<< triple( @terms ) >>

diff --git a/lib/Attean/SimpleQueryEvaluator.pm b/lib/Attean/SimpleQueryEvaluator.pm
@@ -692,7 +692,6 @@ package Attean::SimpleQueryEvaluator::ExpressionEvaluator 0.034 {
 	use POSIX qw(ceil floor);
 	use Digest;
 	use UUID::Tiny ':std';
-	use List::MoreUtils qw(zip);
 	use DateTime::Format::W3CDTF;
 	use I18N::LangTags;
 	use namespace::clean;

diff --git a/lib/AtteanX/Parser/SPARQL.pm b/lib/AtteanX/Parser/SPARQL.pm
@@ -84,7 +84,7 @@ use Carp qw(cluck confess croak);
 use Attean;
 use Data::Dumper;
 use URI::NamespaceMap;
-use List::MoreUtils qw(zip);
+use List::Util qw(mesh);
 use AtteanX::Parser::SPARQLLex;
 use AtteanX::SPARQL::Constants;
 use Types::Standard qw(ConsumerOf InstanceOf HashRef ArrayRef Bool Str Int);
@@ -564,7 +564,7 @@ sub _statements_with_fresh_bnodes {
 					push(@terms, $term);
 				}
 			}
-			push(@triples_with_fresh_bnodes, ref($t)->new(zip @pos, @terms));
+			push(@triples_with_fresh_bnodes, ref($t)->new(mesh \@pos, \@terms));
 		} else {
 			push(@triples_with_fresh_bnodes, $t);
 		}

diff --git a/lib/AtteanX/Parser/SPARQLLex.pm b/lib/AtteanX/Parser/SPARQLLex.pm
@@ -45,7 +45,6 @@ package AtteanX::Parser::SPARQLLex 0.034 {
 	use Attean;
 	use Encode;
 	use Encode qw(decode);
-	use List::MoreUtils qw(zip);
 	use Types::Standard qw(ArrayRef);
 	use namespace::clean;
 
@@ -110,7 +109,6 @@ package AtteanX::Parser::SPARQLLex::Iterator 0.034 {
 	use Attean;
 	use Encode;
 	use Encode qw(decode);
-	use List::MoreUtils qw(zip);
 	use AtteanX::SPARQL::Token;
 	use AtteanX::SPARQL::Constants;
 	use Types::Standard qw(FileHandle Ref Str Int ArrayRef HashRef ConsumerOf InstanceOf);

diff --git a/lib/AtteanX/Parser/SPARQLTSV.pm b/lib/AtteanX/Parser/SPARQLTSV.pm
@@ -41,7 +41,6 @@ package AtteanX::Parser::SPARQLTSV 0.034 {
 	use Attean;
 	use Encode;
 	use Encode qw(decode);
-	use List::MoreUtils qw(zip);
 	use namespace::clean;
 
 	sub canonical_media_type { return "text/tab-separated-values" }

diff --git a/lib/AtteanX/Parser/Turtle/Token.pm b/lib/AtteanX/Parser/Turtle/Token.pm
@@ -61,7 +61,7 @@ package AtteanX::Parser::Turtle::Token;
 
 use Moo;
 use Types::Standard qw(ArrayRef Str);
-use List::MoreUtils qw(zip);
+use List::Util qw(mesh);
 use Sub::Util qw(set_subname);
 use AtteanX::Parser::Turtle::Constants;
 use Sub::Install;
@@ -98,7 +98,7 @@ my @KEYS	= qw(type start_line start_column line column args);
 sub fast_constructor {
 	my $class = shift;
 	return $class->new(
-		zip @KEYS, @_
+		mesh \@KEYS, \@_
 	);
 }
 

diff --git a/lib/AtteanX/SPARQL/Token.pm b/lib/AtteanX/SPARQL/Token.pm
@@ -59,7 +59,7 @@ package AtteanX::SPARQL::Token 0.034;
 
 use Moo;
 use Types::Standard qw(ArrayRef Str);
-use List::MoreUtils qw(zip);
+use List::Util qw(mesh);
 use Sub::Util qw(set_subname);
 use AtteanX::SPARQL::Constants;
 use namespace::clean;
@@ -95,7 +95,7 @@ my @KEYS	= qw(type start_line start_column line column args);
 sub fast_constructor {
 	my $class = shift;
 	return $class->new(
-		zip @KEYS, @_
+		mesh \@KEYS, \@_
 	);
 }
 

diff --git a/lib/AtteanX/Serializer/NQuads.pm b/lib/AtteanX/Serializer/NQuads.pm
@@ -44,7 +44,7 @@ package AtteanX::Serializer::NQuads 0.034 {
 	use Types::Standard qw(Str ArrayRef);
 	use Encode qw(encode);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	extends 'AtteanX::Serializer::NTuples';

diff --git a/lib/AtteanX/Serializer/NTriples.pm b/lib/AtteanX/Serializer/NTriples.pm
@@ -44,7 +44,7 @@ package AtteanX::Serializer::NTriples 0.034 {
 	use Types::Standard qw(Str ArrayRef);
 	use Encode qw(encode);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	extends 'AtteanX::Serializer::NTuples';

diff --git a/lib/AtteanX/Serializer/NTuples.pm b/lib/AtteanX/Serializer/NTuples.pm
@@ -29,7 +29,7 @@ package AtteanX::Serializer::NTuples 0.034 {
 	use Moo;
 	use Encode qw(encode);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 =item C<< serialize_iter_to_io( $fh, $iterator ) >>

diff --git a/lib/AtteanX/Serializer/RDFXML.pm b/lib/AtteanX/Serializer/RDFXML.pm
@@ -48,7 +48,7 @@ package AtteanX::Serializer::RDFXML 0.034 {
 	use Scalar::Util qw(blessed);
 	use Attean::API::Iterator;
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	has 'canonical_media_type' => (is => 'ro', isa => Str, init_arg => undef, default => 'application/rdf+xml');

diff --git a/lib/AtteanX/Serializer/SPARQL.pm b/lib/AtteanX/Serializer/SPARQL.pm
@@ -45,7 +45,7 @@ package AtteanX::Serializer::SPARQL 0.034 {
 	use Encode qw(encode);
 	use Attean::ListIterator;
 	use Scalar::Util qw(blessed);
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use AtteanX::SPARQL::Constants;
 	use namespace::clean;
 	with 'Attean::API::AbbreviatingSerializer';

diff --git a/lib/AtteanX/Serializer/SPARQLCSV.pm b/lib/AtteanX/Serializer/SPARQLCSV.pm
@@ -41,7 +41,7 @@ package AtteanX::Serializer::SPARQLCSV 0.034 {
 	use Encode qw(encode);
 	use Scalar::Util qw(blessed);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use Text::CSV;
 	use namespace::clean;
 

diff --git a/lib/AtteanX/Serializer/SPARQLHTML.pm b/lib/AtteanX/Serializer/SPARQLHTML.pm
@@ -41,7 +41,7 @@ package AtteanX::Serializer::SPARQLHTML 0.034 {
 	use Encode qw(encode);
 	use Scalar::Util qw(blessed);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	has 'full_document' => (is => 'rw', isa => Bool, default => 1);

diff --git a/lib/AtteanX/Serializer/SPARQLTSV.pm b/lib/AtteanX/Serializer/SPARQLTSV.pm
@@ -41,7 +41,7 @@ package AtteanX::Serializer::SPARQLTSV 0.034 {
 	use Encode qw(encode);
 	use Scalar::Util qw(blessed);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	has 'canonical_media_type' => (is => 'ro', isa => Str, init_arg => undef, default => 'text/tab-separated-values');

diff --git a/lib/AtteanX/Serializer/SPARQLXML.pm b/lib/AtteanX/Serializer/SPARQLXML.pm
@@ -41,7 +41,7 @@ package AtteanX::Serializer::SPARQLXML 0.034 {
 	use Encode qw(encode encode_utf8);
 	use Scalar::Util qw(blessed);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use namespace::clean;
 
 	has 'canonical_media_type' => (is => 'ro', isa => Str, init_arg => undef, default => 'application/sparql-results+xml');

diff --git a/lib/AtteanX/Serializer/TextTable.pm b/lib/AtteanX/Serializer/TextTable.pm
@@ -41,7 +41,7 @@ package AtteanX::Serializer::TextTable 0.034 {
 	use Encode qw(encode);
 	use Scalar::Util qw(blessed);
 	use Attean::ListIterator;
-	use List::MoreUtils qw(any);
+	use List::Util qw(any);
 	use Text::Table;
 	use namespace::clean;