diff --git a/Cargo.lock b/Cargo.lock index 6cfedd4a56da8..90bc42360aa31 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,14 +69,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6" -[[package]] -name = "arena" -version = "0.0.0" -dependencies = [ - "rustc_data_structures", - "smallvec 1.4.0", -] - [[package]] name = "argon2rs" version = "0.2.5" @@ -1200,14 +1192,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "fmt_macros" -version = "0.0.0" -dependencies = [ - "rustc_lexer", - "rustc_span", -] - [[package]] name = "fnv" version = "1.0.6" @@ -1389,10 +1373,6 @@ dependencies = [ "regex", ] -[[package]] -name = "graphviz" -version = "0.0.0" - [[package]] name = "h2" version = "0.1.25" @@ -3599,6 +3579,14 @@ dependencies = [ "smallvec 1.4.0", ] +[[package]] +name = "rustc_arena" +version = "0.0.0" +dependencies = [ + "rustc_data_structures", + "smallvec 1.4.0", +] + [[package]] name = "rustc_ast" version = "0.0.0" @@ -3609,9 +3597,9 @@ dependencies = [ "rustc_index", "rustc_lexer", "rustc_macros", + "rustc_serialize", "rustc_span", "scoped-tls", - "serialize", "smallvec 1.4.0", ] @@ -3619,8 +3607,8 @@ dependencies = [ name = "rustc_ast_lowering" version = "0.0.0" dependencies = [ - "arena", "log", + "rustc_arena", "rustc_ast", "rustc_ast_pretty", "rustc_data_structures", @@ -3670,9 +3658,9 @@ dependencies = [ "rustc_errors", "rustc_feature", "rustc_macros", + "rustc_serialize", "rustc_session", "rustc_span", - "serialize", "version_check", ] @@ -3680,7 +3668,6 @@ dependencies = [ name = "rustc_builtin_macros" version = "0.0.0" dependencies = [ - "fmt_macros", "log", "rustc_ast", "rustc_ast_pretty", @@ -3690,6 +3677,7 @@ dependencies = [ "rustc_expand", "rustc_feature", "rustc_parse", + "rustc_parse_format", "rustc_session", "rustc_span", "rustc_target", @@ -3718,10 +3706,10 @@ dependencies = [ "rustc_index", "rustc_llvm", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", - "serialize", "smallvec 1.4.0", ] @@ -3746,11 +3734,11 @@ dependencies = [ "rustc_incremental", "rustc_index", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_symbol_mangling", "rustc_target", - "serialize", "tempfile", ] @@ -3762,7 +3750,6 @@ dependencies = [ "cfg-if", "crossbeam-utils 0.7.2", "ena 0.14.0", - "graphviz", "indexmap", "jobserver", "lazy_static", @@ -3774,8 +3761,9 @@ dependencies = [ "rustc-hash", "rustc-rayon", "rustc-rayon-core", + "rustc_graphviz", "rustc_index", - "serialize", + "rustc_serialize", "smallvec 1.4.0", "stable_deref_trait", "stacker", @@ -3807,10 +3795,10 @@ dependencies = [ "rustc_parse", "rustc_plugin_impl", "rustc_save_analysis", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", - "serialize", "winapi 0.3.8", ] @@ -3826,8 +3814,8 @@ dependencies = [ "atty", "log", "rustc_data_structures", + "rustc_serialize", "rustc_span", - "serialize", "termcolor", "termize", "unicode-width", @@ -3848,9 +3836,9 @@ dependencies = [ "rustc_feature", "rustc_lexer", "rustc_parse", + "rustc_serialize", "rustc_session", "rustc_span", - "serialize", "smallvec 1.4.0", ] @@ -3867,6 +3855,10 @@ dependencies = [ name = "rustc_fs_util" version = "0.0.0" +[[package]] +name = "rustc_graphviz" +version = "0.0.0" + [[package]] name = "rustc_hir" version = "0.0.0" @@ -3877,9 +3869,9 @@ dependencies = [ "rustc_data_structures", "rustc_index", "rustc_macros", + "rustc_serialize", "rustc_span", "rustc_target", - "serialize", "smallvec 1.4.0", ] @@ -3898,24 +3890,24 @@ dependencies = [ name = "rustc_incremental" version = "0.0.0" dependencies = [ - "graphviz", "log", "rand 0.7.3", "rustc_ast", "rustc_data_structures", "rustc_fs_util", + "rustc_graphviz", "rustc_hir", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", - "serialize", ] [[package]] name = "rustc_index" version = "0.0.0" dependencies = [ - "serialize", + "rustc_serialize", "smallvec 1.4.0", ] @@ -3923,19 +3915,19 @@ dependencies = [ name = "rustc_infer" version = "0.0.0" dependencies = [ - "graphviz", "log", "rustc_ast", "rustc_data_structures", "rustc_errors", + "rustc_graphviz", "rustc_hir", "rustc_index", "rustc_macros", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", - "serialize", "smallvec 1.4.0", ] @@ -3969,6 +3961,7 @@ dependencies = [ "rustc_plugin_impl", "rustc_privacy", "rustc_resolve", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_symbol_mangling", @@ -3977,7 +3970,6 @@ dependencies = [ "rustc_traits", "rustc_ty", "rustc_typeck", - "serialize", "smallvec 1.4.0", "tempfile", "winapi 0.3.8", @@ -4047,10 +4039,10 @@ dependencies = [ "rustc_hir_pretty", "rustc_index", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", - "serialize", "smallvec 1.4.0", "stable_deref_trait", "winapi 0.3.8", @@ -4060,7 +4052,6 @@ dependencies = [ name = "rustc_middle" version = "0.0.0" dependencies = [ - "arena", "bitflags", "byteorder", "chalk-ir", @@ -4069,6 +4060,7 @@ dependencies = [ "polonius-engine", "rustc-rayon-core", "rustc_apfloat", + "rustc_arena", "rustc_ast", "rustc_attr", "rustc_data_structures", @@ -4078,11 +4070,11 @@ dependencies = [ "rustc_index", "rustc_macros", "rustc_query_system", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", "scoped-tls", - "serialize", "smallvec 1.4.0", ] @@ -4091,7 +4083,6 @@ name = "rustc_mir" version = "0.0.0" dependencies = [ "either", - "graphviz", "itertools 0.8.0", "log", "log_settings", @@ -4101,17 +4092,18 @@ dependencies = [ "rustc_attr", "rustc_data_structures", "rustc_errors", + "rustc_graphviz", "rustc_hir", "rustc_index", "rustc_infer", "rustc_lexer", "rustc_macros", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", "rustc_trait_selection", - "serialize", "smallvec 1.4.0", ] @@ -4119,9 +4111,9 @@ dependencies = [ name = "rustc_mir_build" version = "0.0.0" dependencies = [ - "arena", "log", "rustc_apfloat", + "rustc_arena", "rustc_ast", "rustc_attr", "rustc_data_structures", @@ -4130,11 +4122,11 @@ dependencies = [ "rustc_index", "rustc_infer", "rustc_middle", + "rustc_serialize", "rustc_session", "rustc_span", "rustc_target", "rustc_trait_selection", - "serialize", "smallvec 1.4.0", ] @@ -4155,6 +4147,14 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "rustc_parse_format" +version = "0.0.0" +dependencies = [ + "rustc_lexer", + "rustc_span", +] + [[package]] name = "rustc_passes" version = "0.0.0" @@ -4206,15 +4206,15 @@ dependencies = [ name = "rustc_query_system" version = "0.0.0" dependencies = [ - "arena", "log", "parking_lot 0.10.2", "rustc-rayon-core", + "rustc_arena", "rustc_data_structures", "rustc_errors", "rustc_index", + "rustc_serialize", "rustc_span", - "serialize", "smallvec 1.4.0", ] @@ -4222,9 +4222,9 @@ dependencies = [ name = "rustc_resolve" version = "0.0.0" dependencies = [ - "arena", "bitflags", "log", + "rustc_arena", "rustc_ast", "rustc_ast_lowering", "rustc_ast_pretty", @@ -4260,6 +4260,14 @@ dependencies = [ "serde_json", ] +[[package]] +name = "rustc_serialize" +version = "0.0.0" +dependencies = [ + "indexmap", + "smallvec 1.4.0", +] + [[package]] name = "rustc_session" version = "0.0.0" @@ -4272,24 +4280,24 @@ dependencies = [ "rustc_errors", "rustc_feature", "rustc_fs_util", + "rustc_serialize", "rustc_span", "rustc_target", - "serialize", ] [[package]] name = "rustc_span" version = "0.0.0" dependencies = [ - "arena", "cfg-if", "log", "md-5", + "rustc_arena", "rustc_data_structures", "rustc_index", "rustc_macros", + "rustc_serialize", "scoped-tls", - "serialize", "sha-1", "unicode-width", ] @@ -4319,8 +4327,8 @@ dependencies = [ "rustc_data_structures", "rustc_index", "rustc_macros", + "rustc_serialize", "rustc_span", - "serialize", ] [[package]] @@ -4337,7 +4345,6 @@ checksum = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee" name = "rustc_trait_selection" version = "0.0.0" dependencies = [ - "fmt_macros", "log", "rustc_ast", "rustc_attr", @@ -4348,6 +4355,7 @@ dependencies = [ "rustc_infer", "rustc_macros", "rustc_middle", + "rustc_parse_format", "rustc_session", "rustc_span", "rustc_target", @@ -4393,8 +4401,8 @@ dependencies = [ name = "rustc_typeck" version = "0.0.0" dependencies = [ - "arena", "log", + "rustc_arena", "rustc_ast", "rustc_attr", "rustc_data_structures", @@ -4657,14 +4665,6 @@ dependencies = [ "url 1.7.2", ] -[[package]] -name = "serialize" -version = "0.0.0" -dependencies = [ - "indexmap", - "smallvec 1.4.0", -] - [[package]] name = "sha-1" version = "0.8.2" diff --git a/src/librustc_arena/Cargo.toml b/src/librustc_arena/Cargo.toml index 5158aab8b7dc5..dfae956e2b6d5 100644 --- a/src/librustc_arena/Cargo.toml +++ b/src/librustc_arena/Cargo.toml @@ -1,11 +1,11 @@ [package] authors = ["The Rust Project Developers"] -name = "arena" +name = "rustc_arena" version = "0.0.0" edition = "2018" [lib] -name = "arena" +name = "rustc_arena" path = "lib.rs" [dependencies] diff --git a/src/librustc_ast/Cargo.toml b/src/librustc_ast/Cargo.toml index 7d105f9e8863d..6bd65fd5f96c7 100644 --- a/src/librustc_ast/Cargo.toml +++ b/src/librustc_ast/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } log = "0.4" scoped-tls = "1.0" rustc_span = { path = "../librustc_span" } diff --git a/src/librustc_ast_lowering/Cargo.toml b/src/librustc_ast_lowering/Cargo.toml index b477b75db5adc..8a49b157816f6 100644 --- a/src/librustc_ast_lowering/Cargo.toml +++ b/src/librustc_ast_lowering/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } log = { version = "0.4", features = ["release_max_level_info", "std"] } rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_hir = { path = "../librustc_hir" } diff --git a/src/librustc_attr/Cargo.toml b/src/librustc_attr/Cargo.toml index d7af7fe6143e5..677796a8df0b3 100644 --- a/src/librustc_attr/Cargo.toml +++ b/src/librustc_attr/Cargo.toml @@ -12,7 +12,7 @@ doctest = false [dependencies] rustc_ast_pretty = { path = "../librustc_ast_pretty" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_errors = { path = "../librustc_errors" } rustc_span = { path = "../librustc_span" } rustc_data_structures = { path = "../librustc_data_structures" } diff --git a/src/librustc_builtin_macros/Cargo.toml b/src/librustc_builtin_macros/Cargo.toml index c15438bde440e..7e7c9bf81f473 100644 --- a/src/librustc_builtin_macros/Cargo.toml +++ b/src/librustc_builtin_macros/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -fmt_macros = { path = "../libfmt_macros" } +fmt_macros = { path = "../librustc_parse_format", package = "rustc_parse_format" } log = "0.4" rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_attr = { path = "../librustc_attr" } diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 64e66595d92d9..bedefcc30ed8c 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -29,7 +29,7 @@ rustc_incremental = { path = "../librustc_incremental" } rustc_index = { path = "../librustc_index" } rustc_llvm = { path = "../librustc_llvm" } rustc_session = { path = "../librustc_session" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_target = { path = "../librustc_target" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } rustc_ast = { path = "../librustc_ast" } diff --git a/src/librustc_codegen_ssa/Cargo.toml b/src/librustc_codegen_ssa/Cargo.toml index e8bfc87aef5ea..eeb6b4aabcf29 100644 --- a/src/librustc_codegen_ssa/Cargo.toml +++ b/src/librustc_codegen_ssa/Cargo.toml @@ -19,7 +19,7 @@ libc = "0.2.50" jobserver = "0.1.11" tempfile = "3.1" -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_ast = { path = "../librustc_ast" } rustc_span = { path = "../librustc_span" } rustc_middle = { path = "../librustc_middle" } diff --git a/src/librustc_data_structures/Cargo.toml b/src/librustc_data_structures/Cargo.toml index 67721220526ca..be887ba9adb56 100644 --- a/src/librustc_data_structures/Cargo.toml +++ b/src/librustc_data_structures/Cargo.toml @@ -16,8 +16,8 @@ log = "0.4" jobserver_crate = { version = "0.1.13", package = "jobserver" } lazy_static = "1" once_cell = { version = "1", features = ["parking_lot"] } -rustc_serialize = { path = "../libserialize", package = "serialize" } -graphviz = { path = "../libgraphviz" } +rustc_serialize = { path = "../librustc_serialize" } +graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" } cfg-if = "0.1.2" crossbeam-utils = { version = "0.7", features = ["nightly"] } stable_deref_trait = "1.0.0" diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml index cfd103aed3240..75d6592076655 100644 --- a/src/librustc_driver/Cargo.toml +++ b/src/librustc_driver/Cargo.toml @@ -32,7 +32,7 @@ rustc_codegen_ssa = { path = "../librustc_codegen_ssa" } rustc_session = { path = "../librustc_session" } rustc_error_codes = { path = "../librustc_error_codes" } rustc_interface = { path = "../librustc_interface" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_ast = { path = "../librustc_ast" } rustc_span = { path = "../librustc_span" } diff --git a/src/librustc_errors/Cargo.toml b/src/librustc_errors/Cargo.toml index b8340b1a1df6a..ed1f43e567da6 100644 --- a/src/librustc_errors/Cargo.toml +++ b/src/librustc_errors/Cargo.toml @@ -11,7 +11,7 @@ doctest = false [dependencies] log = "0.4" -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_span = { path = "../librustc_span" } rustc_data_structures = { path = "../librustc_data_structures" } unicode-width = "0.1.4" diff --git a/src/librustc_expand/Cargo.toml b/src/librustc_expand/Cargo.toml index 3cb79030771b8..ef617acfe1314 100644 --- a/src/librustc_expand/Cargo.toml +++ b/src/librustc_expand/Cargo.toml @@ -11,7 +11,7 @@ path = "lib.rs" doctest = false [dependencies] -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } log = "0.4" rustc_span = { path = "../librustc_span" } rustc_ast_pretty = { path = "../librustc_ast_pretty" } diff --git a/src/librustc_graphviz/Cargo.toml b/src/librustc_graphviz/Cargo.toml index 4a6e41f760319..9a5e78a560cf0 100644 --- a/src/librustc_graphviz/Cargo.toml +++ b/src/librustc_graphviz/Cargo.toml @@ -1,9 +1,9 @@ [package] authors = ["The Rust Project Developers"] -name = "graphviz" +name = "rustc_graphviz" version = "0.0.0" edition = "2018" [lib] -name = "graphviz" +name = "rustc_graphviz" path = "lib.rs" diff --git a/src/librustc_hir/Cargo.toml b/src/librustc_hir/Cargo.toml index 811440fdeb987..1b91d769c7047 100644 --- a/src/librustc_hir/Cargo.toml +++ b/src/librustc_hir/Cargo.toml @@ -15,7 +15,7 @@ rustc_macros = { path = "../librustc_macros" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_index = { path = "../librustc_index" } rustc_span = { path = "../librustc_span" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_ast = { path = "../librustc_ast" } lazy_static = "1" log = { version = "0.4", features = ["release_max_level_info", "std"] } diff --git a/src/librustc_incremental/Cargo.toml b/src/librustc_incremental/Cargo.toml index 5caf1d411e637..8a9b69ce51e32 100644 --- a/src/librustc_incremental/Cargo.toml +++ b/src/librustc_incremental/Cargo.toml @@ -10,13 +10,13 @@ path = "lib.rs" doctest = false [dependencies] -graphviz = { path = "../libgraphviz" } +graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" } log = "0.4" rand = "0.7" rustc_middle = { path = "../librustc_middle" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_hir = { path = "../librustc_hir" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_ast = { path = "../librustc_ast" } rustc_span = { path = "../librustc_span" } rustc_fs_util = { path = "../librustc_fs_util" } diff --git a/src/librustc_index/Cargo.toml b/src/librustc_index/Cargo.toml index 1435297f27ada..f0422b1af1b97 100644 --- a/src/librustc_index/Cargo.toml +++ b/src/librustc_index/Cargo.toml @@ -10,5 +10,5 @@ path = "lib.rs" doctest = false [dependencies] -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } diff --git a/src/librustc_infer/Cargo.toml b/src/librustc_infer/Cargo.toml index fa8e5a2ab78b4..54d1610f49eb9 100644 --- a/src/librustc_infer/Cargo.toml +++ b/src/librustc_infer/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -graphviz = { path = "../libgraphviz" } +graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" } log = { version = "0.4", features = ["release_max_level_info", "std"] } rustc_middle = { path = "../librustc_middle" } rustc_data_structures = { path = "../librustc_data_structures" } @@ -19,7 +19,7 @@ rustc_hir = { path = "../librustc_hir" } rustc_index = { path = "../librustc_index" } rustc_macros = { path = "../librustc_macros" } rustc_session = { path = "../librustc_session" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_span = { path = "../librustc_span" } rustc_target = { path = "../librustc_target" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml index 2963eb29bc170..112dc7037f588 100644 --- a/src/librustc_interface/Cargo.toml +++ b/src/librustc_interface/Cargo.toml @@ -21,7 +21,7 @@ rustc_expand = { path = "../librustc_expand" } rustc_parse = { path = "../librustc_parse" } rustc_session = { path = "../librustc_session" } rustc_span = { path = "../librustc_span" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_middle = { path = "../librustc_middle" } rustc_ast_lowering = { path = "../librustc_ast_lowering" } rustc_ast_passes = { path = "../librustc_ast_passes" } diff --git a/src/librustc_metadata/Cargo.toml b/src/librustc_metadata/Cargo.toml index b03e884cdaf7a..7bbe7567d2924 100644 --- a/src/librustc_metadata/Cargo.toml +++ b/src/librustc_metadata/Cargo.toml @@ -23,7 +23,7 @@ rustc_hir = { path = "../librustc_hir" } rustc_hir_pretty = { path = "../librustc_hir_pretty" } rustc_target = { path = "../librustc_target" } rustc_index = { path = "../librustc_index" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } stable_deref_trait = "1.0.0" rustc_ast = { path = "../librustc_ast" } rustc_expand = { path = "../librustc_expand" } diff --git a/src/librustc_middle/Cargo.toml b/src/librustc_middle/Cargo.toml index 0bb32438b7276..1a7e3b36cb002 100644 --- a/src/librustc_middle/Cargo.toml +++ b/src/librustc_middle/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } bitflags = "1.2.1" scoped-tls = "1.0" log = { version = "0.4", features = ["release_max_level_info", "std"] } @@ -26,7 +26,7 @@ rustc_data_structures = { path = "../librustc_data_structures" } rustc_query_system = { path = "../librustc_query_system" } rustc_errors = { path = "../librustc_errors" } rustc_index = { path = "../librustc_index" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_ast = { path = "../librustc_ast" } rustc_span = { path = "../librustc_span" } byteorder = { version = "1.3" } diff --git a/src/librustc_mir/Cargo.toml b/src/librustc_mir/Cargo.toml index d922a83232901..bfe3b22962e79 100644 --- a/src/librustc_mir/Cargo.toml +++ b/src/librustc_mir/Cargo.toml @@ -11,7 +11,7 @@ doctest = false [dependencies] either = "1.5.0" -dot = { path = "../libgraphviz", package = "graphviz" } +dot = { path = "../librustc_graphviz", package = "rustc_graphviz" } itertools = "0.8" log = "0.4" log_settings = "0.1.1" @@ -25,7 +25,7 @@ rustc_index = { path = "../librustc_index" } rustc_infer = { path = "../librustc_infer" } rustc_lexer = { path = "../librustc_lexer" } rustc_macros = { path = "../librustc_macros" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_session = { path = "../librustc_session" } rustc_target = { path = "../librustc_target" } rustc_trait_selection = { path = "../librustc_trait_selection" } diff --git a/src/librustc_mir/borrow_check/region_infer/graphviz.rs b/src/librustc_mir/borrow_check/region_infer/graphviz.rs index 39b396ba4e7d3..6a60917e22c7c 100644 --- a/src/librustc_mir/borrow_check/region_infer/graphviz.rs +++ b/src/librustc_mir/borrow_check/region_infer/graphviz.rs @@ -1,5 +1,5 @@ //! This module provides linkage between RegionInferenceContext and -//! libgraphviz traits, specialized to attaching borrowck analysis +//! librustc_graphviz traits, specialized to attaching borrowck analysis //! data to rendered labels. use std::borrow::Cow; diff --git a/src/librustc_mir/util/graphviz.rs b/src/librustc_mir/util/graphviz.rs index fb862b926d782..3583223b5fe9c 100644 --- a/src/librustc_mir/util/graphviz.rs +++ b/src/librustc_mir/util/graphviz.rs @@ -76,7 +76,7 @@ where /// Write a graphviz HTML-styled label for the given basic block, with /// all necessary escaping already performed. (This is suitable for /// emitting directly, as is done in this module, or for use with the -/// LabelText::HtmlStr from libgraphviz.) +/// LabelText::HtmlStr from librustc_graphviz.) /// /// `init` and `fini` are callbacks for emitting additional rows of /// data (using HTML enclosed with `` in the emitted text). diff --git a/src/librustc_mir_build/Cargo.toml b/src/librustc_mir_build/Cargo.toml index 4a64cf74787ac..54fb8fb171c6e 100644 --- a/src/librustc_mir_build/Cargo.toml +++ b/src/librustc_mir_build/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } log = "0.4" rustc_middle = { path = "../librustc_middle" } rustc_apfloat = { path = "../librustc_apfloat" } @@ -20,7 +20,7 @@ rustc_index = { path = "../librustc_index" } rustc_errors = { path = "../librustc_errors" } rustc_hir = { path = "../librustc_hir" } rustc_infer = { path = "../librustc_infer" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_session = { path = "../librustc_session" } rustc_span = { path = "../librustc_span" } rustc_target = { path = "../librustc_target" } diff --git a/src/librustc_parse_format/Cargo.toml b/src/librustc_parse_format/Cargo.toml index 01608701a79dc..646509569f3a5 100644 --- a/src/librustc_parse_format/Cargo.toml +++ b/src/librustc_parse_format/Cargo.toml @@ -1,11 +1,11 @@ [package] authors = ["The Rust Project Developers"] -name = "fmt_macros" +name = "rustc_parse_format" version = "0.0.0" edition = "2018" [lib] -name = "fmt_macros" +name = "rustc_parse_format" path = "lib.rs" [dependencies] diff --git a/src/librustc_query_system/Cargo.toml b/src/librustc_query_system/Cargo.toml index 392e19e1f4471..7bf208d2f86e1 100644 --- a/src/librustc_query_system/Cargo.toml +++ b/src/librustc_query_system/Cargo.toml @@ -10,13 +10,13 @@ path = "lib.rs" doctest = false [dependencies] -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } log = { version = "0.4", features = ["release_max_level_info", "std"] } rustc-rayon-core = "0.3.0" rustc_data_structures = { path = "../librustc_data_structures" } rustc_errors = { path = "../librustc_errors" } rustc_index = { path = "../librustc_index" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_span = { path = "../librustc_span" } parking_lot = "0.10" smallvec = { version = "1.0", features = ["union", "may_dangle"] } diff --git a/src/librustc_resolve/Cargo.toml b/src/librustc_resolve/Cargo.toml index 420a82d6d2ced..0259e342f43d7 100644 --- a/src/librustc_resolve/Cargo.toml +++ b/src/librustc_resolve/Cargo.toml @@ -14,7 +14,7 @@ doctest = false bitflags = "1.2.1" log = "0.4" rustc_ast = { path = "../librustc_ast" } -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } rustc_middle = { path = "../librustc_middle" } rustc_ast_lowering = { path = "../librustc_ast_lowering" } rustc_ast_pretty = { path = "../librustc_ast_pretty" } diff --git a/src/librustc_serialize/Cargo.toml b/src/librustc_serialize/Cargo.toml index 96a0d51bc716d..84206df50ccee 100644 --- a/src/librustc_serialize/Cargo.toml +++ b/src/librustc_serialize/Cargo.toml @@ -1,11 +1,11 @@ [package] authors = ["The Rust Project Developers"] -name = "serialize" +name = "rustc_serialize" version = "0.0.0" edition = "2018" [lib] -name = "serialize" +name = "rustc_serialize" path = "lib.rs" [dependencies] diff --git a/src/librustc_session/Cargo.toml b/src/librustc_session/Cargo.toml index 705c115cf3c85..4d57c6384ddbd 100644 --- a/src/librustc_session/Cargo.toml +++ b/src/librustc_session/Cargo.toml @@ -14,7 +14,7 @@ log = "0.4" rustc_errors = { path = "../librustc_errors" } rustc_feature = { path = "../librustc_feature" } rustc_target = { path = "../librustc_target" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_span = { path = "../librustc_span" } rustc_fs_util = { path = "../librustc_fs_util" } diff --git a/src/librustc_span/Cargo.toml b/src/librustc_span/Cargo.toml index 1c2721260d69b..9cb0e54080aab 100644 --- a/src/librustc_span/Cargo.toml +++ b/src/librustc_span/Cargo.toml @@ -10,11 +10,11 @@ path = "lib.rs" doctest = false [dependencies] -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_macros = { path = "../librustc_macros" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_index = { path = "../librustc_index" } -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } scoped-tls = "1.0" unicode-width = "0.1.4" cfg-if = "0.1.2" diff --git a/src/librustc_target/Cargo.toml b/src/librustc_target/Cargo.toml index 0e234036879e5..c73490e451320 100644 --- a/src/librustc_target/Cargo.toml +++ b/src/librustc_target/Cargo.toml @@ -13,6 +13,6 @@ bitflags = "1.2.1" log = "0.4" rustc_data_structures = { path = "../librustc_data_structures" } rustc_macros = { path = "../librustc_macros" } -rustc_serialize = { path = "../libserialize", package = "serialize" } +rustc_serialize = { path = "../librustc_serialize" } rustc_span = { path = "../librustc_span" } rustc_index = { path = "../librustc_index" } diff --git a/src/librustc_trait_selection/Cargo.toml b/src/librustc_trait_selection/Cargo.toml index 254695e53e04d..a1d984dcef0ff 100644 --- a/src/librustc_trait_selection/Cargo.toml +++ b/src/librustc_trait_selection/Cargo.toml @@ -10,7 +10,7 @@ path = "lib.rs" doctest = false [dependencies] -fmt_macros = { path = "../libfmt_macros" } +fmt_macros = { path = "../librustc_parse_format", package = "rustc_parse_format" } log = { version = "0.4", features = ["release_max_level_info", "std"] } rustc_attr = { path = "../librustc_attr" } rustc_middle = { path = "../librustc_middle" } diff --git a/src/librustc_typeck/Cargo.toml b/src/librustc_typeck/Cargo.toml index 8aaa29bc582fc..b505b59806f35 100644 --- a/src/librustc_typeck/Cargo.toml +++ b/src/librustc_typeck/Cargo.toml @@ -11,7 +11,7 @@ test = false doctest = false [dependencies] -arena = { path = "../libarena" } +arena = { path = "../librustc_arena", package = "rustc_arena" } log = "0.4" rustc_middle = { path = "../librustc_middle" } rustc_attr = { path = "../librustc_attr" }