[前][次][番号順一覧][スレッド一覧]

ruby-changes:62990

From: Kazuhiro <ko1@a...>
Date: Thu, 17 Sep 2020 20:35:44 +0900 (JST)
Subject: [ruby-changes:62990] e4dbb91f4c (master): Fix typos [ci skip]

https://git.ruby-lang.org/ruby.git/commit/?id=e4dbb91f4c

From e4dbb91f4cb202b09a2382f322cd66cdc22df348 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@m...>
Date: Thu, 17 Sep 2020 20:34:59 +0900
Subject: Fix typos [ci skip]

s/overriden/overridden/

diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
index eecfc44..d6aaea7 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -92076,7 +92076,7 @@ Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@r...> https://github.com/ruby/ruby/blob/trunk/doc/ChangeLog-1.9.3#L92076
 
 	* eval.c (rb_thread_start_0): should not error_print() within
 	  terminated thread, because $stderr used by it might be
-	  overriden now.  [ruby-dev:21280]
+	  overridden now.  [ruby-dev:21280]
 
 Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@r...>
 
diff --git a/lib/bundler/cli/pristine.rb b/lib/bundler/cli/pristine.rb
index 53da90b..d6654f8 100644
--- a/lib/bundler/cli/pristine.rb
+++ b/lib/bundler/cli/pristine.rb
@@ -30,7 +30,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/cli/pristine.rb#L30
           FileUtils.rm_rf spec.full_gem_path
         when Source::Git
           if source.local?
-            Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overriden.")
+            Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.")
             next
           end
 
diff --git a/spec/bundler/commands/pristine_spec.rb b/spec/bundler/commands/pristine_spec.rb
index 20958ef..6978f30 100644
--- a/spec/bundler/commands/pristine_spec.rb
+++ b/spec/bundler/commands/pristine_spec.rb
@@ -93,7 +93,7 @@ RSpec.describe "bundle pristine", :ruby_repo do https://github.com/ruby/ruby/blob/trunk/spec/bundler/commands/pristine_spec.rb#L93
 
       bundle "pristine"
       expect(changes_txt).to be_file
-      expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overriden.")
+      expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overridden.")
     end
   end
 
diff --git a/test/ostruct/test_ostruct.rb b/test/ostruct/test_ostruct.rb
index 560979e..8fa7ba6 100644
--- a/test/ostruct/test_ostruct.rb
+++ b/test/ostruct/test_ostruct.rb
@@ -230,13 +230,13 @@ class TC_OpenStruct < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ostruct/test_ostruct.rb#L230
     assert_nil os.foo
   end
 
-  def test_overriden_private_methods
+  def test_overridden_private_methods
     os = OpenStruct.new(puts: :foo, format: :bar)
     assert_equal(:foo, os.puts)
     assert_equal(:bar, os.format)
   end
 
-  def test_overriden_public_methods
+  def test_overridden_public_methods
     os = OpenStruct.new(method: :foo, class: :bar)
     assert_equal(:foo, os.method)
     assert_equal(:bar, os.class)
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]