From d21ff7d5ad6ddc9efe309601b50cc4ddc3eed24a Mon Sep 17 00:00:00 2001 From: Marc-Andre Lafortune Date: Fri, 15 May 2020 03:44:54 -0400 Subject: [PATCH] Remove unneeded conditionals with latest rubocop-ast --- lib/rubocop.rb | 2 +- lib/rubocop/ast_aliases.rb | 6 +++--- rubocop.gemspec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/rubocop.rb b/lib/rubocop.rb index b76dc1a2cfd..cf82d5de1d6 100644 --- 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 index 7160fb5af20..4e229d25de7 100644 --- 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 index 0d99f73034a..3132321a9de 100644 --- 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')