From 08f3aecf6b1da82b54a8a103ba5ed440554b9f45 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 27 Sep 2016 21:56:56 +0100
Subject: [PATCH] uninstall: consistent spelling of "dependent"

@ilovezfs pointed out that Homebrew generally uses "dependent", rather than
"dependant".
---
 Library/Homebrew/cmd/uninstall.rb | 10 +++++-----
 Library/Homebrew/keg.rb           |  2 +-
 Library/Homebrew/test/test_keg.rb | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index d9d3ef883a..30806942bc 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -16,11 +16,11 @@ module Homebrew
 
     if !ARGV.force?
       ARGV.kegs.each do |keg|
-        dependants = keg.installed_dependants
-        if dependants.any?
-          dependants_output = dependants.map { |k| "#{k.name} #{k.version}" }.join(", ")
-          conjugation = dependants.count == 1 ? "is" : "are"
-          ofail "Refusing to uninstall #{keg} because it is required by #{dependants_output}, which #{conjugation} currently installed."
+        dependents = keg.installed_dependents
+        if dependents.any?
+          dependents_output = dependents.map { |k| "#{k.name} #{k.version}" }.join(", ")
+          conjugation = dependents.count == 1 ? "is" : "are"
+          ofail "Refusing to uninstall #{keg} because it is required by #{dependents_output}, which #{conjugation} currently installed."
           puts "You can override this and force removal with `brew uninstall --force #{keg.name}`."
           next
         end
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 0f58d688c7..23ebd9d98f 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -296,7 +296,7 @@ class Keg
     Formulary.from_keg(self)
   end
 
-  def installed_dependants
+  def installed_dependents
     Formula.installed.flat_map(&:installed_kegs).select do |keg|
       Tab.for_keg(keg).runtime_dependencies.any? do |dep|
         # Resolve formula rather than directly comparing names
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index 41ccb27eec..ac5831b092 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -329,34 +329,34 @@ class InstalledDependantsTests < LinkTests
 
   def setup
     super
-    @dependant = setup_test_keg("bar", "1.0")
+    @dependent = setup_test_keg("bar", "1.0")
   end
 
   def dependencies(deps)
-    tab = Tab.for_keg(@dependant)
-    tab.tabfile = @dependant.join("INSTALL_RECEIPT.json")
+    tab = Tab.for_keg(@dependent)
+    tab.tabfile = @dependent.join("INSTALL_RECEIPT.json")
     tab.runtime_dependencies = deps
     tab.write
   end
 
   def test_no_dependencies
     dependencies []
-    assert_empty @keg.installed_dependants
+    assert_empty @keg.installed_dependents
   end
 
   def test_same_name_different_version
     dependencies [{ "full_name" => "foo", "version" => "1.1" }]
-    assert_empty @keg.installed_dependants
+    assert_empty @keg.installed_dependents
   end
 
   def test_different_name_same_version
     stub_formula_name("baz")
     dependencies [{ "full_name" => "baz", "version" => @keg.version.to_s }]
-    assert_empty @keg.installed_dependants
+    assert_empty @keg.installed_dependents
   end
 
   def test_same_name_and_version
     dependencies [{ "full_name" => "foo", "version" => "1.0" }]
-    assert_equal [@dependant], @keg.installed_dependants
+    assert_equal [@dependent], @keg.installed_dependents
   end
 end