Merge master.

3 files changed, 7 insertions, 7 deletions

diff --git a/mrbgems/mruby-symbol-ext/mrblib/symbol.rb b/mrbgems/mruby-symbol-ext/mrblib/symbol.rb
index 99fa275d5..4b4cf83fe 100644
--- a/mrbgems/mruby-symbol-ext/mrblib/symbol.rb
+++ b/mrbgems/mruby-symbol-ext/mrblib/symbol.rb
@@ -10,7 +10,7 @@ class Symbol
   # Same as <code>sym.to_s.capitalize.intern</code>.
 
   def capitalize
-    (self.to_s.capitalize! || self).to_sym
+    self.to_s.capitalize.to_sym
   end
 
   ##
@@ -20,7 +20,7 @@ class Symbol
   # Same as <code>sym.to_s.downcase.intern</code>.
 
   def downcase
-    (self.to_s.downcase! || self).to_sym
+    self.to_s.downcase.to_sym
   end
 
   ##
@@ -30,7 +30,7 @@ class Symbol
   # Same as <code>sym.to_s.upcase.intern</code>.
 
   def upcase
-    (self.to_s.upcase! || self).to_sym
+    self.to_s.upcase.to_sym
   end
 
   ##
@@ -41,7 +41,7 @@ class Symbol
 
   def casecmp(other)
     return nil unless other.kind_of?(Symbol)
-    lhs =  self.to_s; lhs.upcase!
+    lhs =  self.to_s.upcase
     rhs = other.to_s.upcase
     lhs <=> rhs
   end
diff --git a/mrbgems/mruby-symbol-ext/src/symbol.c b/mrbgems/mruby-symbol-ext/src/symbol.c
index ccb2971dc..87f8381b1 100644
--- a/mrbgems/mruby-symbol-ext/src/symbol.c
+++ b/mrbgems/mruby-symbol-ext/src/symbol.c
@@ -46,10 +46,10 @@ mrb_sym_length(mrb_state *mrb, mrb_value self)
   mrb_int len;
 #ifdef MRB_UTF8_STRING
   mrb_int byte_len;
-  const char *name = mrb_sym2name_len(mrb, mrb_symbol(self), &byte_len);
+  const char *name = mrb_sym_name_len(mrb, mrb_symbol(self), &byte_len);
   len = mrb_utf8_len(name, byte_len);
 #else
-  mrb_sym2name_len(mrb, mrb_symbol(self), &len);
+  mrb_sym_name_len(mrb, mrb_symbol(self), &len);
 #endif
   return mrb_fixnum_value(len);
 }
diff --git a/mrbgems/mruby-symbol-ext/test/symbol.rb b/mrbgems/mruby-symbol-ext/test/symbol.rb
index 61ecad247..db686e5f4 100644
--- a/mrbgems/mruby-symbol-ext/test/symbol.rb
+++ b/mrbgems/mruby-symbol-ext/test/symbol.rb
@@ -14,7 +14,7 @@ end
   assert("Symbol##{n}") do
     assert_equal 5, :hello.__send__(n)
     assert_equal 4, :"aA\0b".__send__(n)
-    if "あ".size == 1  # enable MRB_UTF8_STRING?
+    if __ENCODING__ == "UTF-8"
       assert_equal 8, :"こんにちは世界!".__send__(n)
       assert_equal 4, :"aあ\0b".__send__(n)
     else