Move byte_store.dart and file_byte_store.dart to their own subdirectory.

This allows us to use the subpackage relationships test to verify that
they don't import any other parts of front_end, which paves the way
for the possibility of moving them to their own package in the future.

R=scheglov@google.com, sigmund@google.com

Review-Url: https://codereview.chromium.org/2990323002 .

pkg/analysis_server/lib/src/analysis_server.dart

@@ -58,8 +58,8 @@ import 'package:analyzer/src/generated/utilities_general.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:analyzer_plugin/protocol/protocol_common.dart' hide Element;
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
-import 'package:front_end/src/incremental/file_byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
+import 'package:front_end/src/byte_store/file_byte_store.dart';
 import 'package:plugin/plugin.dart';
 import 'package:telemetry/crash_reporting.dart';
 import 'package:telemetry/telemetry.dart' as telemetry;

pkg/analysis_server/test/abstract_context.dart

@@ -18,7 +18,7 @@ import 'package:analyzer/src/generated/engine.dart' as engine;
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 
 import 'mock_sdk.dart';
 

pkg/analysis_server/test/context_manager_test.dart

@@ -27,7 +27,7 @@ import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/summary/summary_file_builder.dart';
 import 'package:analyzer/src/util/glob.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:linter/src/rules.dart';
 import 'package:linter/src/rules/avoid_as.dart';
 import 'package:path/path.dart' as path;

pkg/analysis_server/test/services/search/search_engine_test.dart

@@ -15,7 +15,7 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 

pkg/analysis_server/test/src/plugin/plugin_watcher_test.dart

@@ -18,7 +18,7 @@ import 'package:analyzer/src/dart/analysis/session.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analyzer/lib/src/context/builder.dart

@@ -34,7 +34,7 @@ import 'package:analyzer/src/summary/summary_sdk.dart';
 import 'package:analyzer/src/task/options.dart';
 import 'package:args/args.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:package_config/packages.dart';
 import 'package:package_config/packages_file.dart';
 import 'package:package_config/src/packages_impl.dart';

pkg/analyzer/lib/src/dart/analysis/byte_store.dart

@@ -5,5 +5,5 @@
 // This library re-exports the parts of front_end's byte_store.dart whose API is
 // stable enough to be relied upon by clients.
 
-export 'package:front_end/src/incremental/byte_store.dart'
+export 'package:front_end/src/byte_store/byte_store.dart'
     show ByteStore, MemoryByteStore, MemoryCachingByteStore;

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -41,7 +41,7 @@ import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:front_end/src/base/api_signature.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:meta/meta.dart';
 
 /**

pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart

@@ -5,5 +5,5 @@
 // This library re-exports the parts of front_end's file_byte_store.dart whose
 // API is stable enough to be relied upon by clients.
 
-export 'package:front_end/src/incremental/file_byte_store.dart'
+export 'package:front_end/src/byte_store/file_byte_store.dart'
     show FileByteStore;

pkg/analyzer/lib/src/dart/analysis/file_state.dart

@@ -34,7 +34,7 @@ import 'package:front_end/src/base/performace_logger.dart';
 import 'package:front_end/src/fasta/builder/builder.dart' as fasta;
 import 'package:front_end/src/fasta/parser/parser.dart' as fasta;
 import 'package:front_end/src/fasta/scanner.dart' as fasta;
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:meta/meta.dart';
 
 /**

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -20,7 +20,7 @@ import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:analyzer/src/task/dart.dart' show COMPILATION_UNIT_ELEMENT;
 import 'package:analyzer/task/dart.dart' show LibrarySpecificUnit;
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 
 /**
  * Context information necessary to analyze one or more libraries within an

pkg/analyzer/lib/src/lint/analysis.dart

@@ -25,7 +25,7 @@ import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/services/lint.dart';
 import 'package:analyzer/src/util/sdk.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:package_config/packages.dart' show Packages;
 import 'package:package_config/packages_file.dart' as pkgfile show parse;
 import 'package:package_config/src/packages_impl.dart' show MapPackages;

pkg/analyzer/test/generated/resolver_test_case.dart

@@ -28,7 +28,7 @@ import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
 import 'package:analyzer/src/generated/testing/element_factory.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:test/test.dart';
 
 import '../src/context/mock_sdk.dart';

pkg/analyzer/test/src/dart/analysis/base.dart

@@ -15,7 +15,7 @@ import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 

pkg/analyzer/test/src/dart/analysis/driver_test.dart

@@ -25,7 +25,7 @@ import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/summary/idl.dart';
 import 'package:analyzer/src/summary/package_bundle_reader.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analyzer/test/src/dart/analysis/file_state_test.dart

@@ -17,7 +17,7 @@ import 'package:analyzer/src/generated/source.dart';
 import 'package:convert/convert.dart';
 import 'package:crypto/crypto.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/analyzer/test/src/summary/resynthesize_kernel_test.dart

@@ -18,7 +18,7 @@ import 'package:front_end/src/base/performace_logger.dart';
 import 'package:front_end/src/base/libraries_specification.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental/kernel_driver.dart';
 import 'package:kernel/kernel.dart' as kernel;
 import 'package:kernel/target/targets.dart';

pkg/analyzer/test/src/task/strong/strong_test_helper.dart

@@ -24,7 +24,7 @@ import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:source_span/source_span.dart';
 import 'package:test/test.dart';
 

pkg/analyzer_cli/lib/src/driver.dart

@@ -40,7 +40,7 @@ import 'package:analyzer_cli/src/options.dart';
 import 'package:analyzer_cli/src/perf_report.dart';
 import 'package:analyzer_cli/starter.dart' show CommandLineStarter;
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:linter/src/rules.dart' as linter;
 import 'package:meta/meta.dart';
 import 'package:package_config/discovery.dart' as pkg_discovery;

pkg/front_end/example/incremental_reload/compiler_with_invalidation.dart

@@ -12,8 +12,8 @@ import 'dart:async';
 
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/incremental_kernel_generator.dart';
-import 'package:front_end/src/incremental/file_byte_store.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/file_byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/limited_ast_to_binary.dart';
 

pkg/front_end/lib/compiler_options.dart

@@ -5,7 +5,7 @@
 library front_end.compiler_options;
 
 import 'package:front_end/src/base/performace_logger.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:kernel/target/targets.dart' show Target;
 
 import 'compilation_message.dart';

pkg/front_end/lib/src/base/processed_options.dart

@@ -14,7 +14,7 @@ import 'package:front_end/src/fasta/severity.dart';
 import 'package:front_end/src/fasta/ticker.dart';
 import 'package:front_end/src/fasta/uri_translator.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/multi_root_file_system.dart';
 import 'package:kernel/kernel.dart'
     show Program, loadProgramFromBytes, CanonicalName;

pkg/front_end/lib/src/byte_store/file_byte_store.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:path/path.dart';
 
 /**

pkg/front_end/lib/src/incremental/file_state.dart

@@ -12,7 +12,7 @@ import 'package:front_end/file_system.dart';
 import 'package:front_end/src/base/resolve_relative_uri.dart';
 import 'package:front_end/src/dependency_walker.dart' as graph;
 import 'package:front_end/src/fasta/uri_translator.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental/format.dart';
 import 'package:front_end/src/incremental/unlinked_unit.dart';
 import 'package:kernel/target/vm.dart';

pkg/front_end/lib/src/incremental/kernel_driver.dart

@@ -15,7 +15,7 @@ import 'package:front_end/src/fasta/kernel/kernel_target.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/fasta/ticker.dart';
 import 'package:front_end/src/fasta/uri_translator.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental/file_state.dart';
 import 'package:kernel/binary/ast_from_binary.dart';
 import 'package:kernel/core_types.dart';

pkg/front_end/test/incremental_kernel_generator_test.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/incremental_kernel_generator.dart';
 import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental_kernel_generator_impl.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/text/ast_to_text.dart';

pkg/front_end/test/src/byte_store/byte_store_test.dart

@@ -2,7 +2,7 @@
 // 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.
 
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:mockito/mockito.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';

pkg/front_end/test/src/incremental/file_state_test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 
 import 'package:front_end/memory_file_system.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental/file_state.dart';
 import 'package:package_config/packages.dart';
 import 'package:test/test.dart';

pkg/front_end/test/src/incremental/hot_reload_e2e_test.dart

@@ -15,7 +15,7 @@ import 'package:front_end/compiler_options.dart';
 import 'package:front_end/file_system.dart';
 import 'package:front_end/incremental_kernel_generator.dart';
 import 'package:front_end/memory_file_system.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/testing/hybrid_file_system.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/binary/limited_ast_to_binary.dart';

pkg/front_end/test/src/incremental/kernel_driver_test.dart

@@ -10,7 +10,7 @@ import 'package:front_end/src/base/performace_logger.dart';
 import 'package:front_end/src/base/processed_options.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
 import 'package:front_end/src/fasta/uri_translator_impl.dart';
-import 'package:front_end/src/incremental/byte_store.dart';
+import 'package:front_end/src/byte_store/byte_store.dart';
 import 'package:front_end/src/incremental/kernel_driver.dart';
 import 'package:front_end/summary_generator.dart';
 import 'package:kernel/ast.dart';

pkg/front_end/test/src/incremental/test_all.dart

@@ -4,7 +4,6 @@
 
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import 'byte_store_test.dart' as byte_store;
 import 'file_state_test.dart' as file_state;
 import 'format_test.dart' as format;
 import 'kernel_driver_test.dart' as kernel_driver;
@@ -12,7 +11,6 @@ import 'kernel_driver_test.dart' as kernel_driver;
 /// Utility for manually running all tests.
 main() {
   defineReflectiveSuite(() {
-    byte_store.main();
     file_state.main();
     format.main();
     kernel_driver.main();

pkg/front_end/test/subpackage_relationships_test.dart

@@ -41,8 +41,8 @@ final subpackageRules = {
   'lib': new SubpackageRules(allowedDependencies: [
     'lib/src',
     'lib/src/base',
+    'lib/src/byte_store',
     'lib/src/fasta',
-    'lib/src/incremental',
   ]),
   'lib/src': new SubpackageRules(allowedDependencies: [
     'lib',
@@ -56,10 +56,13 @@ final subpackageRules = {
   'lib/src/base': new SubpackageRules(allowedDependencies: [
     'lib',
     'lib/src',
+    'lib/src/byte_store',
     'lib/src/fasta',
     'lib/src/fasta/util',
-    'lib/src/incremental'
   ]),
+  // Note: byte_store should never depend on other parts of front_end, since we
+  // may want to move it to its own package someday.
+  'lib/src/byte_store': new SubpackageRules(allowedDependencies: []),
   'lib/src/codegen': new SubpackageRules(),
   'lib/src/fasta': new SubpackageRules(allowedDependencies: [
     'lib',
@@ -140,6 +143,7 @@ final subpackageRules = {
     'lib',
     'lib/src',
     'lib/src/base',
+    'lib/src/byte_store',
     'lib/src/fasta',
     'lib/src/fasta/dill',
     'lib/src/fasta/kernel',