further refactoring: merge RestrictedRules into TypeRules

lib/strong_mode.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /// Types needed to implement "strong" checking in the Dart analyzer. This is
 /// intended to be used by `analyzer_cli` and `analysis_server` packages.
 library dev_compiler.strong_mode;
 
 import 'package:analyzer/src/generated/engine.dart'
     show
         AnalysisContext,
         AnalysisContextImpl,
         AnalysisEngine,
         AnalysisErrorInfo,
         AnalysisErrorInfoImpl;
 import 'package:analyzer/src/generated/error.dart'
     show
         AnalysisError,
         AnalysisErrorListener,
         CompileTimeErrorCode,
         ErrorCode,
         ErrorSeverity,
         HintCode,
         StaticTypeWarningCode;
 import 'package:analyzer/src/generated/source.dart' show Source;
 import 'package:args/args.dart';
 
 import 'src/analysis_context.dart' show enableDevCompilerInference;
 import 'src/checker/checker.dart' show CodeChecker;
-import 'src/checker/rules.dart' show RestrictedRules;
+import 'src/checker/rules.dart' show TypeRules;
 
 /// A type checker for Dart code that operates under stronger rules, and has
 /// the ability to do local type inference in some situations.
 class StrongChecker {
   final AnalysisContext _context;
   final CodeChecker _checker;
   final _ErrorCollector _reporter;
 
   StrongChecker._(this._context, this._checker, this._reporter);
 
   factory StrongChecker(AnalysisContext context, StrongModeOptions options) {
     // TODO(vsm): Remove this once analyzer_cli is completely switched to the
     // task model.
     if (!AnalysisEngine
         .instance.useTaskModel) enableDevCompilerInference(context, options);
-    var rules = new RestrictedRules(context.typeProvider, options: options);
+    var rules = new TypeRules(context.typeProvider, options: options);
     var reporter = new _ErrorCollector(options.hints);
     var checker = new CodeChecker(rules, reporter);
     return new StrongChecker._(context, checker, reporter);
   }
 
   /// Computes and returns DDC errors for the [source].
   AnalysisErrorInfo computeErrors(Source source) {
     var errors = new List<AnalysisError>();
     _reporter.errors = errors;
 
@@ skipping 102 matching lines @@
 
   bool operator ==(Object other) {
     if (other is! StrongModeOptions) return false;
     StrongModeOptions s = other;
     return inferTransitively == s.inferTransitively &&
         onlyInferConstsAndFinalFields == s.onlyInferConstsAndFinalFields &&
         inferDownwards == s.inferDownwards &&
         relaxedCasts == s.relaxedCasts;
   }
 }