From b683de4ad79242fdeebcae2afefb72c1530babe9 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sun, 29 Dec 2019 16:39:31 +0300 Subject: [PATCH] Rename directories for some crates from `syntax_x` to `rustc_x` `syntax_expand` -> `rustc_expand` `syntax_pos` -> `rustc_span` `syntax_ext` -> `rustc_builtin_macros` --- src/{libsyntax_ext => librustc_builtin_macros}/Cargo.toml | 0 src/{libsyntax_ext => librustc_builtin_macros}/asm.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/assert.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/cfg.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/cmdline_attrs.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/compile_error.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/concat.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/concat_idents.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/bounds.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/clone.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/cmp/eq.rs | 0 .../deriving/cmp/ord.rs | 0 .../deriving/cmp/partial_eq.rs | 0 .../deriving/cmp/partial_ord.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/debug.rs | 0 .../deriving/decodable.rs | 0 .../deriving/default.rs | 0 .../deriving/encodable.rs | 0 .../deriving/generic/mod.rs | 0 .../deriving/generic/ty.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/hash.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/deriving/mod.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/env.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/format.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/format_foreign.rs | 0 .../format_foreign/printf/tests.rs | 0 .../format_foreign/shell/tests.rs | 0 .../global_allocator.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/global_asm.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/lib.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/log_syntax.rs | 0 .../proc_macro_harness.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/source_util.rs | 0 .../standard_library_imports.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/test.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/test_harness.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/trace_macros.rs | 0 src/{libsyntax_ext => librustc_builtin_macros}/util.rs | 0 src/{libsyntax_expand => librustc_expand}/Cargo.toml | 0 src/{libsyntax_expand => librustc_expand}/base.rs | 0 src/{libsyntax_expand => librustc_expand}/build.rs | 0 src/{libsyntax_expand => librustc_expand}/expand.rs | 0 src/{libsyntax_expand => librustc_expand}/lib.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe/macro_check.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe/macro_parser.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe/macro_rules.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe/quoted.rs | 0 src/{libsyntax_expand => librustc_expand}/mbe/transcribe.rs | 0 src/{libsyntax_expand => librustc_expand}/mut_visit/tests.rs | 0 src/{libsyntax_expand => librustc_expand}/parse/lexer/tests.rs | 0 src/{libsyntax_expand => librustc_expand}/parse/tests.rs | 0 src/{libsyntax_expand => librustc_expand}/placeholders.rs | 0 src/{libsyntax_expand => librustc_expand}/proc_macro.rs | 0 src/{libsyntax_expand => librustc_expand}/proc_macro_server.rs | 0 src/{libsyntax_expand => librustc_expand}/tests.rs | 0 src/{libsyntax_expand => librustc_expand}/tokenstream/tests.rs | 0 src/{libsyntax_pos => librustc_span}/Cargo.toml | 0 src/{libsyntax_pos => librustc_span}/analyze_source_file.rs | 0 src/{libsyntax_pos => librustc_span}/analyze_source_file/tests.rs | 0 src/{libsyntax_pos => librustc_span}/caching_source_map_view.rs | 0 src/{libsyntax_pos => librustc_span}/edition.rs | 0 src/{libsyntax_pos => librustc_span}/fatal_error.rs | 0 src/{libsyntax_pos => librustc_span}/hygiene.rs | 0 src/{libsyntax_pos => librustc_span}/lib.rs | 0 src/{libsyntax_pos => librustc_span}/source_map.rs | 0 src/{libsyntax_pos => librustc_span}/source_map/tests.rs | 0 src/{libsyntax_pos => librustc_span}/span_encoding.rs | 0 src/{libsyntax_pos => librustc_span}/symbol.rs | 0 src/{libsyntax_pos => librustc_span}/symbol/tests.rs | 0 src/{libsyntax_pos => librustc_span}/tests.rs | 0 71 files changed, 0 insertions(+), 0 deletions(-) rename src/{libsyntax_ext => librustc_builtin_macros}/Cargo.toml (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/asm.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/assert.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/cfg.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/cmdline_attrs.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/compile_error.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/concat.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/concat_idents.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/bounds.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/clone.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/cmp/eq.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/cmp/ord.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/cmp/partial_eq.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/cmp/partial_ord.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/debug.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/decodable.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/default.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/encodable.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/generic/mod.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/generic/ty.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/hash.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/deriving/mod.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/env.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/format.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/format_foreign.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/format_foreign/printf/tests.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/format_foreign/shell/tests.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/global_allocator.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/global_asm.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/lib.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/log_syntax.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/proc_macro_harness.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/source_util.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/standard_library_imports.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/test.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/test_harness.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/trace_macros.rs (100%) rename src/{libsyntax_ext => librustc_builtin_macros}/util.rs (100%) rename src/{libsyntax_expand => librustc_expand}/Cargo.toml (100%) rename src/{libsyntax_expand => librustc_expand}/base.rs (100%) rename src/{libsyntax_expand => librustc_expand}/build.rs (100%) rename src/{libsyntax_expand => librustc_expand}/expand.rs (100%) rename src/{libsyntax_expand => librustc_expand}/lib.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe/macro_check.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe/macro_parser.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe/macro_rules.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe/quoted.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mbe/transcribe.rs (100%) rename src/{libsyntax_expand => librustc_expand}/mut_visit/tests.rs (100%) rename src/{libsyntax_expand => librustc_expand}/parse/lexer/tests.rs (100%) rename src/{libsyntax_expand => librustc_expand}/parse/tests.rs (100%) rename src/{libsyntax_expand => librustc_expand}/placeholders.rs (100%) rename src/{libsyntax_expand => librustc_expand}/proc_macro.rs (100%) rename src/{libsyntax_expand => librustc_expand}/proc_macro_server.rs (100%) rename src/{libsyntax_expand => librustc_expand}/tests.rs (100%) rename src/{libsyntax_expand => librustc_expand}/tokenstream/tests.rs (100%) rename src/{libsyntax_pos => librustc_span}/Cargo.toml (100%) rename src/{libsyntax_pos => librustc_span}/analyze_source_file.rs (100%) rename src/{libsyntax_pos => librustc_span}/analyze_source_file/tests.rs (100%) rename src/{libsyntax_pos => librustc_span}/caching_source_map_view.rs (100%) rename src/{libsyntax_pos => librustc_span}/edition.rs (100%) rename src/{libsyntax_pos => librustc_span}/fatal_error.rs (100%) rename src/{libsyntax_pos => librustc_span}/hygiene.rs (100%) rename src/{libsyntax_pos => librustc_span}/lib.rs (100%) rename src/{libsyntax_pos => librustc_span}/source_map.rs (100%) rename src/{libsyntax_pos => librustc_span}/source_map/tests.rs (100%) rename src/{libsyntax_pos => librustc_span}/span_encoding.rs (100%) rename src/{libsyntax_pos => librustc_span}/symbol.rs (100%) rename src/{libsyntax_pos => librustc_span}/symbol/tests.rs (100%) rename src/{libsyntax_pos => librustc_span}/tests.rs (100%) diff --git a/src/libsyntax_ext/Cargo.toml b/src/librustc_builtin_macros/Cargo.toml similarity index 100% rename from src/libsyntax_ext/Cargo.toml rename to src/librustc_builtin_macros/Cargo.toml diff --git a/src/libsyntax_ext/asm.rs b/src/librustc_builtin_macros/asm.rs similarity index 100% rename from src/libsyntax_ext/asm.rs rename to src/librustc_builtin_macros/asm.rs diff --git a/src/libsyntax_ext/assert.rs b/src/librustc_builtin_macros/assert.rs similarity index 100% rename from src/libsyntax_ext/assert.rs rename to src/librustc_builtin_macros/assert.rs diff --git a/src/libsyntax_ext/cfg.rs b/src/librustc_builtin_macros/cfg.rs similarity index 100% rename from src/libsyntax_ext/cfg.rs rename to src/librustc_builtin_macros/cfg.rs diff --git a/src/libsyntax_ext/cmdline_attrs.rs b/src/librustc_builtin_macros/cmdline_attrs.rs similarity index 100% rename from src/libsyntax_ext/cmdline_attrs.rs rename to src/librustc_builtin_macros/cmdline_attrs.rs diff --git a/src/libsyntax_ext/compile_error.rs b/src/librustc_builtin_macros/compile_error.rs similarity index 100% rename from src/libsyntax_ext/compile_error.rs rename to src/librustc_builtin_macros/compile_error.rs diff --git a/src/libsyntax_ext/concat.rs b/src/librustc_builtin_macros/concat.rs similarity index 100% rename from src/libsyntax_ext/concat.rs rename to src/librustc_builtin_macros/concat.rs diff --git a/src/libsyntax_ext/concat_idents.rs b/src/librustc_builtin_macros/concat_idents.rs similarity index 100% rename from src/libsyntax_ext/concat_idents.rs rename to src/librustc_builtin_macros/concat_idents.rs diff --git a/src/libsyntax_ext/deriving/bounds.rs b/src/librustc_builtin_macros/deriving/bounds.rs similarity index 100% rename from src/libsyntax_ext/deriving/bounds.rs rename to src/librustc_builtin_macros/deriving/bounds.rs diff --git a/src/libsyntax_ext/deriving/clone.rs b/src/librustc_builtin_macros/deriving/clone.rs similarity index 100% rename from src/libsyntax_ext/deriving/clone.rs rename to src/librustc_builtin_macros/deriving/clone.rs diff --git a/src/libsyntax_ext/deriving/cmp/eq.rs b/src/librustc_builtin_macros/deriving/cmp/eq.rs similarity index 100% rename from src/libsyntax_ext/deriving/cmp/eq.rs rename to src/librustc_builtin_macros/deriving/cmp/eq.rs diff --git a/src/libsyntax_ext/deriving/cmp/ord.rs b/src/librustc_builtin_macros/deriving/cmp/ord.rs similarity index 100% rename from src/libsyntax_ext/deriving/cmp/ord.rs rename to src/librustc_builtin_macros/deriving/cmp/ord.rs diff --git a/src/libsyntax_ext/deriving/cmp/partial_eq.rs b/src/librustc_builtin_macros/deriving/cmp/partial_eq.rs similarity index 100% rename from src/libsyntax_ext/deriving/cmp/partial_eq.rs rename to src/librustc_builtin_macros/deriving/cmp/partial_eq.rs diff --git a/src/libsyntax_ext/deriving/cmp/partial_ord.rs b/src/librustc_builtin_macros/deriving/cmp/partial_ord.rs similarity index 100% rename from src/libsyntax_ext/deriving/cmp/partial_ord.rs rename to src/librustc_builtin_macros/deriving/cmp/partial_ord.rs diff --git a/src/libsyntax_ext/deriving/debug.rs b/src/librustc_builtin_macros/deriving/debug.rs similarity index 100% rename from src/libsyntax_ext/deriving/debug.rs rename to src/librustc_builtin_macros/deriving/debug.rs diff --git a/src/libsyntax_ext/deriving/decodable.rs b/src/librustc_builtin_macros/deriving/decodable.rs similarity index 100% rename from src/libsyntax_ext/deriving/decodable.rs rename to src/librustc_builtin_macros/deriving/decodable.rs diff --git a/src/libsyntax_ext/deriving/default.rs b/src/librustc_builtin_macros/deriving/default.rs similarity index 100% rename from src/libsyntax_ext/deriving/default.rs rename to src/librustc_builtin_macros/deriving/default.rs diff --git a/src/libsyntax_ext/deriving/encodable.rs b/src/librustc_builtin_macros/deriving/encodable.rs similarity index 100% rename from src/libsyntax_ext/deriving/encodable.rs rename to src/librustc_builtin_macros/deriving/encodable.rs diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/librustc_builtin_macros/deriving/generic/mod.rs similarity index 100% rename from src/libsyntax_ext/deriving/generic/mod.rs rename to src/librustc_builtin_macros/deriving/generic/mod.rs diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/librustc_builtin_macros/deriving/generic/ty.rs similarity index 100% rename from src/libsyntax_ext/deriving/generic/ty.rs rename to src/librustc_builtin_macros/deriving/generic/ty.rs diff --git a/src/libsyntax_ext/deriving/hash.rs b/src/librustc_builtin_macros/deriving/hash.rs similarity index 100% rename from src/libsyntax_ext/deriving/hash.rs rename to src/librustc_builtin_macros/deriving/hash.rs diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/librustc_builtin_macros/deriving/mod.rs similarity index 100% rename from src/libsyntax_ext/deriving/mod.rs rename to src/librustc_builtin_macros/deriving/mod.rs diff --git a/src/libsyntax_ext/env.rs b/src/librustc_builtin_macros/env.rs similarity index 100% rename from src/libsyntax_ext/env.rs rename to src/librustc_builtin_macros/env.rs diff --git a/src/libsyntax_ext/format.rs b/src/librustc_builtin_macros/format.rs similarity index 100% rename from src/libsyntax_ext/format.rs rename to src/librustc_builtin_macros/format.rs diff --git a/src/libsyntax_ext/format_foreign.rs b/src/librustc_builtin_macros/format_foreign.rs similarity index 100% rename from src/libsyntax_ext/format_foreign.rs rename to src/librustc_builtin_macros/format_foreign.rs diff --git a/src/libsyntax_ext/format_foreign/printf/tests.rs b/src/librustc_builtin_macros/format_foreign/printf/tests.rs similarity index 100% rename from src/libsyntax_ext/format_foreign/printf/tests.rs rename to src/librustc_builtin_macros/format_foreign/printf/tests.rs diff --git a/src/libsyntax_ext/format_foreign/shell/tests.rs b/src/librustc_builtin_macros/format_foreign/shell/tests.rs similarity index 100% rename from src/libsyntax_ext/format_foreign/shell/tests.rs rename to src/librustc_builtin_macros/format_foreign/shell/tests.rs diff --git a/src/libsyntax_ext/global_allocator.rs b/src/librustc_builtin_macros/global_allocator.rs similarity index 100% rename from src/libsyntax_ext/global_allocator.rs rename to src/librustc_builtin_macros/global_allocator.rs diff --git a/src/libsyntax_ext/global_asm.rs b/src/librustc_builtin_macros/global_asm.rs similarity index 100% rename from src/libsyntax_ext/global_asm.rs rename to src/librustc_builtin_macros/global_asm.rs diff --git a/src/libsyntax_ext/lib.rs b/src/librustc_builtin_macros/lib.rs similarity index 100% rename from src/libsyntax_ext/lib.rs rename to src/librustc_builtin_macros/lib.rs diff --git a/src/libsyntax_ext/log_syntax.rs b/src/librustc_builtin_macros/log_syntax.rs similarity index 100% rename from src/libsyntax_ext/log_syntax.rs rename to src/librustc_builtin_macros/log_syntax.rs diff --git a/src/libsyntax_ext/proc_macro_harness.rs b/src/librustc_builtin_macros/proc_macro_harness.rs similarity index 100% rename from src/libsyntax_ext/proc_macro_harness.rs rename to src/librustc_builtin_macros/proc_macro_harness.rs diff --git a/src/libsyntax_ext/source_util.rs b/src/librustc_builtin_macros/source_util.rs similarity index 100% rename from src/libsyntax_ext/source_util.rs rename to src/librustc_builtin_macros/source_util.rs diff --git a/src/libsyntax_ext/standard_library_imports.rs b/src/librustc_builtin_macros/standard_library_imports.rs similarity index 100% rename from src/libsyntax_ext/standard_library_imports.rs rename to src/librustc_builtin_macros/standard_library_imports.rs diff --git a/src/libsyntax_ext/test.rs b/src/librustc_builtin_macros/test.rs similarity index 100% rename from src/libsyntax_ext/test.rs rename to src/librustc_builtin_macros/test.rs diff --git a/src/libsyntax_ext/test_harness.rs b/src/librustc_builtin_macros/test_harness.rs similarity index 100% rename from src/libsyntax_ext/test_harness.rs rename to src/librustc_builtin_macros/test_harness.rs diff --git a/src/libsyntax_ext/trace_macros.rs b/src/librustc_builtin_macros/trace_macros.rs similarity index 100% rename from src/libsyntax_ext/trace_macros.rs rename to src/librustc_builtin_macros/trace_macros.rs diff --git a/src/libsyntax_ext/util.rs b/src/librustc_builtin_macros/util.rs similarity index 100% rename from src/libsyntax_ext/util.rs rename to src/librustc_builtin_macros/util.rs diff --git a/src/libsyntax_expand/Cargo.toml b/src/librustc_expand/Cargo.toml similarity index 100% rename from src/libsyntax_expand/Cargo.toml rename to src/librustc_expand/Cargo.toml diff --git a/src/libsyntax_expand/base.rs b/src/librustc_expand/base.rs similarity index 100% rename from src/libsyntax_expand/base.rs rename to src/librustc_expand/base.rs diff --git a/src/libsyntax_expand/build.rs b/src/librustc_expand/build.rs similarity index 100% rename from src/libsyntax_expand/build.rs rename to src/librustc_expand/build.rs diff --git a/src/libsyntax_expand/expand.rs b/src/librustc_expand/expand.rs similarity index 100% rename from src/libsyntax_expand/expand.rs rename to src/librustc_expand/expand.rs diff --git a/src/libsyntax_expand/lib.rs b/src/librustc_expand/lib.rs similarity index 100% rename from src/libsyntax_expand/lib.rs rename to src/librustc_expand/lib.rs diff --git a/src/libsyntax_expand/mbe.rs b/src/librustc_expand/mbe.rs similarity index 100% rename from src/libsyntax_expand/mbe.rs rename to src/librustc_expand/mbe.rs diff --git a/src/libsyntax_expand/mbe/macro_check.rs b/src/librustc_expand/mbe/macro_check.rs similarity index 100% rename from src/libsyntax_expand/mbe/macro_check.rs rename to src/librustc_expand/mbe/macro_check.rs diff --git a/src/libsyntax_expand/mbe/macro_parser.rs b/src/librustc_expand/mbe/macro_parser.rs similarity index 100% rename from src/libsyntax_expand/mbe/macro_parser.rs rename to src/librustc_expand/mbe/macro_parser.rs diff --git a/src/libsyntax_expand/mbe/macro_rules.rs b/src/librustc_expand/mbe/macro_rules.rs similarity index 100% rename from src/libsyntax_expand/mbe/macro_rules.rs rename to src/librustc_expand/mbe/macro_rules.rs diff --git a/src/libsyntax_expand/mbe/quoted.rs b/src/librustc_expand/mbe/quoted.rs similarity index 100% rename from src/libsyntax_expand/mbe/quoted.rs rename to src/librustc_expand/mbe/quoted.rs diff --git a/src/libsyntax_expand/mbe/transcribe.rs b/src/librustc_expand/mbe/transcribe.rs similarity index 100% rename from src/libsyntax_expand/mbe/transcribe.rs rename to src/librustc_expand/mbe/transcribe.rs diff --git a/src/libsyntax_expand/mut_visit/tests.rs b/src/librustc_expand/mut_visit/tests.rs similarity index 100% rename from src/libsyntax_expand/mut_visit/tests.rs rename to src/librustc_expand/mut_visit/tests.rs diff --git a/src/libsyntax_expand/parse/lexer/tests.rs b/src/librustc_expand/parse/lexer/tests.rs similarity index 100% rename from src/libsyntax_expand/parse/lexer/tests.rs rename to src/librustc_expand/parse/lexer/tests.rs diff --git a/src/libsyntax_expand/parse/tests.rs b/src/librustc_expand/parse/tests.rs similarity index 100% rename from src/libsyntax_expand/parse/tests.rs rename to src/librustc_expand/parse/tests.rs diff --git a/src/libsyntax_expand/placeholders.rs b/src/librustc_expand/placeholders.rs similarity index 100% rename from src/libsyntax_expand/placeholders.rs rename to src/librustc_expand/placeholders.rs diff --git a/src/libsyntax_expand/proc_macro.rs b/src/librustc_expand/proc_macro.rs similarity index 100% rename from src/libsyntax_expand/proc_macro.rs rename to src/librustc_expand/proc_macro.rs diff --git a/src/libsyntax_expand/proc_macro_server.rs b/src/librustc_expand/proc_macro_server.rs similarity index 100% rename from src/libsyntax_expand/proc_macro_server.rs rename to src/librustc_expand/proc_macro_server.rs diff --git a/src/libsyntax_expand/tests.rs b/src/librustc_expand/tests.rs similarity index 100% rename from src/libsyntax_expand/tests.rs rename to src/librustc_expand/tests.rs diff --git a/src/libsyntax_expand/tokenstream/tests.rs b/src/librustc_expand/tokenstream/tests.rs similarity index 100% rename from src/libsyntax_expand/tokenstream/tests.rs rename to src/librustc_expand/tokenstream/tests.rs diff --git a/src/libsyntax_pos/Cargo.toml b/src/librustc_span/Cargo.toml similarity index 100% rename from src/libsyntax_pos/Cargo.toml rename to src/librustc_span/Cargo.toml diff --git a/src/libsyntax_pos/analyze_source_file.rs b/src/librustc_span/analyze_source_file.rs similarity index 100% rename from src/libsyntax_pos/analyze_source_file.rs rename to src/librustc_span/analyze_source_file.rs diff --git a/src/libsyntax_pos/analyze_source_file/tests.rs b/src/librustc_span/analyze_source_file/tests.rs similarity index 100% rename from src/libsyntax_pos/analyze_source_file/tests.rs rename to src/librustc_span/analyze_source_file/tests.rs diff --git a/src/libsyntax_pos/caching_source_map_view.rs b/src/librustc_span/caching_source_map_view.rs similarity index 100% rename from src/libsyntax_pos/caching_source_map_view.rs rename to src/librustc_span/caching_source_map_view.rs diff --git a/src/libsyntax_pos/edition.rs b/src/librustc_span/edition.rs similarity index 100% rename from src/libsyntax_pos/edition.rs rename to src/librustc_span/edition.rs diff --git a/src/libsyntax_pos/fatal_error.rs b/src/librustc_span/fatal_error.rs similarity index 100% rename from src/libsyntax_pos/fatal_error.rs rename to src/librustc_span/fatal_error.rs diff --git a/src/libsyntax_pos/hygiene.rs b/src/librustc_span/hygiene.rs similarity index 100% rename from src/libsyntax_pos/hygiene.rs rename to src/librustc_span/hygiene.rs diff --git a/src/libsyntax_pos/lib.rs b/src/librustc_span/lib.rs similarity index 100% rename from src/libsyntax_pos/lib.rs rename to src/librustc_span/lib.rs diff --git a/src/libsyntax_pos/source_map.rs b/src/librustc_span/source_map.rs similarity index 100% rename from src/libsyntax_pos/source_map.rs rename to src/librustc_span/source_map.rs diff --git a/src/libsyntax_pos/source_map/tests.rs b/src/librustc_span/source_map/tests.rs similarity index 100% rename from src/libsyntax_pos/source_map/tests.rs rename to src/librustc_span/source_map/tests.rs diff --git a/src/libsyntax_pos/span_encoding.rs b/src/librustc_span/span_encoding.rs similarity index 100% rename from src/libsyntax_pos/span_encoding.rs rename to src/librustc_span/span_encoding.rs diff --git a/src/libsyntax_pos/symbol.rs b/src/librustc_span/symbol.rs similarity index 100% rename from src/libsyntax_pos/symbol.rs rename to src/librustc_span/symbol.rs diff --git a/src/libsyntax_pos/symbol/tests.rs b/src/librustc_span/symbol/tests.rs similarity index 100% rename from src/libsyntax_pos/symbol/tests.rs rename to src/librustc_span/symbol/tests.rs diff --git a/src/libsyntax_pos/tests.rs b/src/librustc_span/tests.rs similarity index 100% rename from src/libsyntax_pos/tests.rs rename to src/librustc_span/tests.rs