Merge branch 'master' into next

diff --git a/lib/sup/label.rb b/lib/sup/label.rb
index e63db9ed6d5790714b40c9d268fab432f45d0325..8902dda5757584c4c9dee553ae4146e415544545 100644 (file)
--- a/lib/sup/label.rb
+++ b/lib/sup/label.rb
@@ -43,7 +43,7 @@ class LabelManager
   ## reverse the label->string mapping, for convenience!
   def string_for l
     if RESERVED_LABELS.include? l
-      l.to_s.ucfirst
+      l.to_s.capitalize
     else
       l.to_s
     end

diff --git a/lib/sup/util.rb b/lib/sup/util.rb
index dbcffcc5951356dec2c533393ba100b4071b8eac..8b92fd2e079761965d3684ab051aee1b72cf6840 100644 (file)
--- a/lib/sup/util.rb
+++ b/lib/sup/util.rb
@@ -188,11 +188,6 @@ class String
     ret
   end
 
-  ## one of the few things i miss from perl
-  def ucfirst
-    self[0 .. 0].upcase + self[1 .. -1]
-  end
-
   ## a very complicated regex found on teh internets to split on
   ## commas, unless they occurr within double quotes.
   def split_on_commas