Remove unneeded conditionals with latest rubocop-ast

koic · May 15, 2020 · d21ff7d · d21ff7d
1 parent 49681a0
commit d21ff7d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/rubocop.rb b/lib/rubocop.rb
@@ -18,7 +18,7 @@
 require_relative 'rubocop/platform'
 require_relative 'rubocop/name_similarity'
 require_relative 'rubocop/string_interpreter'
-require_relative 'rubocop/error' unless RuboCop.const_defined?(:Error)
+require_relative 'rubocop/error'
 require_relative 'rubocop/warning'
 
 require_relative 'rubocop/cop/util'

diff --git a/lib/rubocop/ast_aliases.rb b/lib/rubocop/ast_aliases.rb
@@ -2,7 +2,7 @@
 
 # These aliases are for compatiblity
 module RuboCop
-  NodePattern ||= AST::NodePattern
-  ProcessedSource ||= AST::ProcessedSource
-  Token ||= AST::Token
+  NodePattern = AST::NodePattern
+  ProcessedSource = AST::ProcessedSource
+  Token = AST::Token
 end
diff --git a/rubocop.gemspec b/rubocop.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('parser', '>= 2.7.0.1')
   s.add_runtime_dependency('rainbow', '>= 2.2.2', '< 4.0')
   s.add_runtime_dependency('rexml')
-  s.add_runtime_dependency('rubocop-ast', '>= 0.0.2')
+  s.add_runtime_dependency('rubocop-ast', '>= 0.0.3')
   s.add_runtime_dependency('ruby-progressbar', '~> 1.7')
   s.add_runtime_dependency('unicode-display_width', '>= 1.4.0', '< 2.0')