Deprecate .uniq in favor of .unique

rakudo · Oct 26, 2014 · d44f431 · d44f431
1 parent 5513af3
commit d44f431
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/src/core/Any.pm b/src/core/Any.pm
@@ -56,7 +56,6 @@ my class Any { # declared in BOOTSTRAP
     method Parcel() { self.list.Parcel }
     method elems() { self.list.elems }
     method end()   { self.list.end }
-    method uniq(|c) { self.list.uniq(|c) }
     method squish(|c) { self.list.squish(|c) }
     method rotor(|c) { self.list.rotor(|c) }
     method reverse() { self.list.reverse }
@@ -69,6 +68,12 @@ my class Any { # declared in BOOTSTRAP
     method combinations(|c) { self.list.combinations(|c) }
     method permutations(|c) { self.list.permutations(|c) }
 
+    method unique(|c) { self.list.unique(|c) }
+    method uniq(|c) {
+        DEPRECATED('unique', |<2014.11 2015.11>);
+        self.unique(|c);
+    }
+
     proto method pick(|) { * }
     multi method pick()   { self.list.pick     }
     multi method pick($n) { self.list.pick($n) }

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -622,7 +622,7 @@ my class X::Undeclared::Symbols does X::Comp {
     }
     method message(X::Undeclared::Symbols:D:) {
         sub l(@l) {
-            my @lu = @l.map({ nqp::hllize($_) }).uniq.sort;
+            my @lu = @l.map({ nqp::hllize($_) }).unique.sort;
             'used at line' ~ (@lu == 1 ?? ' ' !! 's ') ~ @lu.join(', ')
         }
         sub s(@s) {

diff --git a/src/core/List.pm b/src/core/List.pm
@@ -458,8 +458,13 @@ my class List does Positional { # declared in BOOTSTRAP
         $tpos >= +$tseq;
     }
 
-    proto method uniq(|) {*}
-    multi method uniq() {
+    method uniq(|c) {
+        DEPRECATED('uniq', |<2014.11 2015.11>);
+        self.unique(|c);
+    }
+
+    proto method unique(|) {*}
+    multi method unique() {
         my $seen := nqp::hash();
         my str $target;
         gather map {
@@ -473,7 +478,7 @@ my class List does Positional { # declared in BOOTSTRAP
             }
         }, @.list;
     }
-    multi method uniq( :&as!, :&with! ) {
+    multi method unique( :&as!, :&with! ) {
         my @seen;  # should be Mu, but doesn't work in settings :-(
         my Mu $target;
         gather map {
@@ -487,7 +492,7 @@ my class List does Positional { # declared in BOOTSTRAP
             }
         }, @.list;
     }
-    multi method uniq( :&as! ) {
+    multi method unique( :&as! ) {
         my $seen := nqp::hash();
         my str $target;
         gather map {
@@ -501,7 +506,7 @@ my class List does Positional { # declared in BOOTSTRAP
             }
         }, @.list;
     }
-    multi method uniq( :&with! ) {
+    multi method unique( :&with! ) {
         nextwith() if &with === &[===]; # use optimized version
 
         my @seen;  # should be Mu, but doesn't work in settings :-(

diff --git a/src/core/Supply.pm b/src/core/Supply.pm
@@ -206,7 +206,12 @@ my role Supply {
         }
     }
 
-    method uniq(Supply:D $self: :&as, :&with, :$expires) {
+    method uniq(Supply:D: |c) {
+        DEPRECATED('unique', |<2014.11 2015.11>);
+        self.unique(|c);
+    }
+
+    method unique(Supply:D $self: :&as, :&with, :$expires) {
         on -> $res {
             $self => do {
                 if $expires {

diff --git a/src/core/signals.pm b/src/core/signals.pm
@@ -6,7 +6,7 @@ sub signal(Signal $signal, *@signals, :$scheduler = $*SCHEDULER) {
         die "Found invalid signals: {@invalid}";
     }
     @signals.unshift: $signal;
-    @signals .= uniq;
+    @signals .= unique;
 
     state %sigmap =
         SIGINT,   nqp::const::SIG_INT,