Remove obsolete guards around canonical_name return value

2 files changed, 1 insertions, 9 deletions

diff --git a/Library/Homebrew/cmd/edit.rb b/Library/Homebrew/cmd/edit.rb
index 4389087d4..5f5fdf2fc 100644
--- a/Library/Homebrew/cmd/edit.rb
+++ b/Library/Homebrew/cmd/edit.rb
@@ -27,11 +27,7 @@ module Homebrew extend self
       # Don't use ARGV.formulae as that will throw if the file doesn't parse
       paths = ARGV.named.map do |name|
         name = Formula.canonical_name name
-        if name.include? '/'
-          Pathname.new(name)
-        else
-          Formula.path(name)
-        end
+        Formula.path(name)
       end
       unless ARGV.force?
         paths.each do |path|
diff --git a/Library/Homebrew/cmd/uninstall.rb b/Library/Homebrew/cmd/uninstall.rb
index 837a1e9f4..d9d13df3e 100644
--- a/Library/Homebrew/cmd/uninstall.rb
+++ b/Library/Homebrew/cmd/uninstall.rb
@@ -18,10 +18,6 @@ module Homebrew extend self
     else
       ARGV.named.each do |name|
         name = Formula.canonical_name(name)
-
-        # FIXME canonical_name is insane
-        raise "Invalid usage" if name.include? '/'
-
         rack = HOMEBREW_CELLAR/name
 
         if rack.directory?