OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #72927 - petrochenkov:rustc, r=Mark-Simulacrum 

Rename all remaining compiler crates to use the `rustc_foo` pattern

libarena -> librustc_arena
libfmt_macros -> librustc_parse_format
libgraphviz -> librustc_graphviz
libserialize -> librustc_serialize

Closes https://github.com/rust-lang/rust/issues/71177 in particular.
This commit is contained in:
bors 2020-06-06 09:00:51 +00:00
parent 826cb062a6 e793b46e49
commit 118b50524b
91 changed files with 178 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
Cargo.lock
View File

@ -69,14 +69,6 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6" checksum = "1025aeae2b664ca0ea726a89d574fe8f4e77dd712d443236ad1de00379450cf6"
[[package]]
name = "arena"
version = "0.0.0"
dependencies = [
"rustc_data_structures",
"smallvec 1.4.0",
]
[[package]] [[package]]
name = "argon2rs" name = "argon2rs"
version = "0.2.5" version = "0.2.5"
@ -1200,14 +1192,6 @@ dependencies = [
"miniz_oxide", "miniz_oxide",
] ]
[[package]]
name = "fmt_macros"
version = "0.0.0"
dependencies = [
"rustc_lexer",
"rustc_span",
]
[[package]] [[package]]
name = "fnv" name = "fnv"
version = "1.0.6" version = "1.0.6"
@ -1389,10 +1373,6 @@ dependencies = [
"regex", "regex",
] ]
[[package]]
name = "graphviz"
version = "0.0.0"
[[package]] [[package]]
name = "h2" name = "h2"
version = "0.1.25" version = "0.1.25"
@ -3599,6 +3579,14 @@ dependencies = [
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
[[package]]
name = "rustc_arena"
version = "0.0.0"
dependencies = [
"rustc_data_structures",
"smallvec 1.4.0",
]
[[package]] [[package]]
name = "rustc_ast" name = "rustc_ast"
version = "0.0.0" version = "0.0.0"
@ -3609,9 +3597,9 @@ dependencies = [
"rustc_index", "rustc_index",
"rustc_lexer", "rustc_lexer",
"rustc_macros", "rustc_macros",
"rustc_serialize",
"rustc_span", "rustc_span",
"scoped-tls", "scoped-tls",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3619,8 +3607,8 @@ dependencies = [
name = "rustc_ast_lowering" name = "rustc_ast_lowering"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"log", "log",
"rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
"rustc_data_structures", "rustc_data_structures",
@ -3670,9 +3658,9 @@ dependencies = [
"rustc_errors", "rustc_errors",
"rustc_feature", "rustc_feature",
"rustc_macros", "rustc_macros",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"serialize",
"version_check", "version_check",
] ]
@ -3680,7 +3668,6 @@ dependencies = [
name = "rustc_builtin_macros" name = "rustc_builtin_macros"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"fmt_macros",
"log", "log",
"rustc_ast", "rustc_ast",
"rustc_ast_pretty", "rustc_ast_pretty",
@ -3690,6 +3677,7 @@ dependencies = [
"rustc_expand", "rustc_expand",
"rustc_feature", "rustc_feature",
"rustc_parse", "rustc_parse",
"rustc_parse_format",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
@ -3718,10 +3706,10 @@ dependencies = [
"rustc_index", "rustc_index",
"rustc_llvm", "rustc_llvm",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3746,11 +3734,11 @@ dependencies = [
"rustc_incremental", "rustc_incremental",
"rustc_index", "rustc_index",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_symbol_mangling", "rustc_symbol_mangling",
"rustc_target", "rustc_target",
"serialize",
"tempfile", "tempfile",
] ]
@ -3762,7 +3750,6 @@ dependencies = [
"cfg-if", "cfg-if",
"crossbeam-utils 0.7.2", "crossbeam-utils 0.7.2",
"ena 0.14.0", "ena 0.14.0",
"graphviz",
"indexmap", "indexmap",
"jobserver", "jobserver",
"lazy_static", "lazy_static",
@ -3774,8 +3761,9 @@ dependencies = [
"rustc-hash", "rustc-hash",
"rustc-rayon", "rustc-rayon",
"rustc-rayon-core", "rustc-rayon-core",
"rustc_graphviz",
"rustc_index", "rustc_index",
"serialize", "rustc_serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
"stable_deref_trait", "stable_deref_trait",
"stacker", "stacker",
@ -3807,10 +3795,10 @@ dependencies = [
"rustc_parse", "rustc_parse",
"rustc_plugin_impl", "rustc_plugin_impl",
"rustc_save_analysis", "rustc_save_analysis",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -3826,8 +3814,8 @@ dependencies = [
"atty", "atty",
"log", "log",
"rustc_data_structures", "rustc_data_structures",
"rustc_serialize",
"rustc_span", "rustc_span",
"serialize",
"termcolor", "termcolor",
"termize", "termize",
"unicode-width", "unicode-width",
@ -3848,9 +3836,9 @@ dependencies = [
"rustc_feature", "rustc_feature",
"rustc_lexer", "rustc_lexer",
"rustc_parse", "rustc_parse",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3867,6 +3855,10 @@ dependencies = [
name = "rustc_fs_util" name = "rustc_fs_util"
version = "0.0.0" version = "0.0.0"
[[package]]
name = "rustc_graphviz"
version = "0.0.0"
[[package]] [[package]]
name = "rustc_hir" name = "rustc_hir"
version = "0.0.0" version = "0.0.0"
@ -3877,9 +3869,9 @@ dependencies = [
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_serialize",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3898,24 +3890,24 @@ dependencies = [
name = "rustc_incremental" name = "rustc_incremental"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"graphviz",
"log", "log",
"rand 0.7.3", "rand 0.7.3",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
"rustc_fs_util", "rustc_fs_util",
"rustc_graphviz",
"rustc_hir", "rustc_hir",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"serialize",
] ]
[[package]] [[package]]
name = "rustc_index" name = "rustc_index"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"serialize", "rustc_serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3923,19 +3915,19 @@ dependencies = [
name = "rustc_infer" name = "rustc_infer"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"graphviz",
"log", "log",
"rustc_ast", "rustc_ast",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
"rustc_graphviz",
"rustc_hir", "rustc_hir",
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -3969,6 +3961,7 @@ dependencies = [
"rustc_plugin_impl", "rustc_plugin_impl",
"rustc_privacy", "rustc_privacy",
"rustc_resolve", "rustc_resolve",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_symbol_mangling", "rustc_symbol_mangling",
@ -3977,7 +3970,6 @@ dependencies = [
"rustc_traits", "rustc_traits",
"rustc_ty", "rustc_ty",
"rustc_typeck", "rustc_typeck",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
"tempfile", "tempfile",
"winapi 0.3.8", "winapi 0.3.8",
@ -4047,10 +4039,10 @@ dependencies = [
"rustc_hir_pretty", "rustc_hir_pretty",
"rustc_index", "rustc_index",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
"stable_deref_trait", "stable_deref_trait",
"winapi 0.3.8", "winapi 0.3.8",
@ -4060,7 +4052,6 @@ dependencies = [
name = "rustc_middle" name = "rustc_middle"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"bitflags", "bitflags",
"byteorder", "byteorder",
"chalk-ir", "chalk-ir",
@ -4069,6 +4060,7 @@ dependencies = [
"polonius-engine", "polonius-engine",
"rustc-rayon-core", "rustc-rayon-core",
"rustc_apfloat", "rustc_apfloat",
"rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
@ -4078,11 +4070,11 @@ dependencies = [
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_query_system", "rustc_query_system",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"scoped-tls", "scoped-tls",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -4091,7 +4083,6 @@ name = "rustc_mir"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"either", "either",
"graphviz",
"itertools 0.8.0", "itertools 0.8.0",
"log", "log",
"log_settings", "log_settings",
@ -4101,17 +4092,18 @@ dependencies = [
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
"rustc_graphviz",
"rustc_hir", "rustc_hir",
"rustc_index", "rustc_index",
"rustc_infer", "rustc_infer",
"rustc_lexer", "rustc_lexer",
"rustc_macros", "rustc_macros",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -4119,9 +4111,9 @@ dependencies = [
name = "rustc_mir_build" name = "rustc_mir_build"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"log", "log",
"rustc_apfloat", "rustc_apfloat",
"rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
@ -4130,11 +4122,11 @@ dependencies = [
"rustc_index", "rustc_index",
"rustc_infer", "rustc_infer",
"rustc_middle", "rustc_middle",
"rustc_serialize",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"rustc_trait_selection", "rustc_trait_selection",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -4155,6 +4147,14 @@ dependencies = [
"unicode-normalization", "unicode-normalization",
] ]
[[package]]
name = "rustc_parse_format"
version = "0.0.0"
dependencies = [
"rustc_lexer",
"rustc_span",
]
[[package]] [[package]]
name = "rustc_passes" name = "rustc_passes"
version = "0.0.0" version = "0.0.0"
@ -4206,15 +4206,15 @@ dependencies = [
name = "rustc_query_system" name = "rustc_query_system"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"log", "log",
"parking_lot 0.10.2", "parking_lot 0.10.2",
"rustc-rayon-core", "rustc-rayon-core",
"rustc_arena",
"rustc_data_structures", "rustc_data_structures",
"rustc_errors", "rustc_errors",
"rustc_index", "rustc_index",
"rustc_serialize",
"rustc_span", "rustc_span",
"serialize",
"smallvec 1.4.0", "smallvec 1.4.0",
] ]
@ -4222,9 +4222,9 @@ dependencies = [
name = "rustc_resolve" name = "rustc_resolve"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"bitflags", "bitflags",
"log", "log",
"rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_ast_lowering", "rustc_ast_lowering",
"rustc_ast_pretty", "rustc_ast_pretty",
@ -4260,6 +4260,14 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "rustc_serialize"
version = "0.0.0"
dependencies = [
"indexmap",
"smallvec 1.4.0",
]
[[package]] [[package]]
name = "rustc_session" name = "rustc_session"
version = "0.0.0" version = "0.0.0"
@ -4272,24 +4280,24 @@ dependencies = [
"rustc_errors", "rustc_errors",
"rustc_feature", "rustc_feature",
"rustc_fs_util", "rustc_fs_util",
"rustc_serialize",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
"serialize",
] ]
[[package]] [[package]]
name = "rustc_span" name = "rustc_span"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"cfg-if", "cfg-if",
"log", "log",
"md-5", "md-5",
"rustc_arena",
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_serialize",
"scoped-tls", "scoped-tls",
"serialize",
"sha-1", "sha-1",
"unicode-width", "unicode-width",
] ]
@ -4319,8 +4327,8 @@ dependencies = [
"rustc_data_structures", "rustc_data_structures",
"rustc_index", "rustc_index",
"rustc_macros", "rustc_macros",
"rustc_serialize",
"rustc_span", "rustc_span",
"serialize",
] ]
[[package]] [[package]]
@ -4337,7 +4345,6 @@ checksum = "b725dadae9fabc488df69a287f5a99c5eaf5d10853842a8a3dfac52476f544ee"
name = "rustc_trait_selection" name = "rustc_trait_selection"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"fmt_macros",
"log", "log",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
@ -4348,6 +4355,7 @@ dependencies = [
"rustc_infer", "rustc_infer",
"rustc_macros", "rustc_macros",
"rustc_middle", "rustc_middle",
"rustc_parse_format",
"rustc_session", "rustc_session",
"rustc_span", "rustc_span",
"rustc_target", "rustc_target",
@ -4393,8 +4401,8 @@ dependencies = [
name = "rustc_typeck" name = "rustc_typeck"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"arena",
"log", "log",
"rustc_arena",
"rustc_ast", "rustc_ast",
"rustc_attr", "rustc_attr",
"rustc_data_structures", "rustc_data_structures",
@ -4657,14 +4665,6 @@ dependencies = [
"url 1.7.2", "url 1.7.2",
] ]
[[package]]
name = "serialize"
version = "0.0.0"
dependencies = [
"indexmap",
"smallvec 1.4.0",
]
[[package]] [[package]]
name = "sha-1" name = "sha-1"
version = "0.8.2" version = "0.8.2"

4
src/libarena/Cargo.toml → src/librustc_arena/Cargo.toml
View File

@ -1,11 +1,11 @@
[package] [package]
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
name = "arena" name = "rustc_arena"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2018"
[lib] [lib]
name = "arena" name = "rustc_arena"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]

0
src/libarena/lib.rs → src/librustc_arena/lib.rs
View File

0
src/libarena/tests.rs → src/librustc_arena/tests.rs
View File

2
src/librustc_ast/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
log = "0.4" log = "0.4"
scoped-tls = "1.0" scoped-tls = "1.0"
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }

2
src/librustc_ast_lowering/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { version = "0.4", features = ["release_max_level_info", "std"] }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_hir = { path = "../librustc_hir" } rustc_hir = { path = "../librustc_hir" }

2
src/librustc_ast_lowering/lib.rs
View File

@ -85,7 +85,7 @@ mod path;
const HIR_ID_COUNTER_LOCKED: u32 = 0xFFFFFFFF; const HIR_ID_COUNTER_LOCKED: u32 = 0xFFFFFFFF;
rustc_hir::arena_types!(::arena::declare_arena, [], 'tcx); rustc_hir::arena_types!(rustc_arena::declare_arena, [], 'tcx);
struct LoweringContext<'a, 'hir: 'a> { struct LoweringContext<'a, 'hir: 'a> {
crate_root: Option<Symbol>, crate_root: Option<Symbol>,

2
src/librustc_attr/Cargo.toml
View File

@ -12,7 +12,7 @@ doctest = false
[dependencies] [dependencies]
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }

2
src/librustc_builtin_macros/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
fmt_macros = { path = "../libfmt_macros" } rustc_parse_format = { path = "../librustc_parse_format" }
log = "0.4" log = "0.4"
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }

3
src/librustc_builtin_macros/asm.rs
View File

@ -1,5 +1,3 @@
use fmt_macros as parse;
use rustc_ast::ast; use rustc_ast::ast;
use rustc_ast::ptr::P; use rustc_ast::ptr::P;
use rustc_ast::token; use rustc_ast::token;
@ -8,6 +6,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_errors::{Applicability, DiagnosticBuilder}; use rustc_errors::{Applicability, DiagnosticBuilder};
use rustc_expand::base::{self, *}; use rustc_expand::base::{self, *};
use rustc_parse::parser::Parser; use rustc_parse::parser::Parser;
use rustc_parse_format as parse;
use rustc_span::symbol::{kw, sym, Symbol}; use rustc_span::symbol::{kw, sym, Symbol};
use rustc_span::{InnerSpan, Span}; use rustc_span::{InnerSpan, Span};

3
src/librustc_builtin_macros/format.rs
View File

@ -1,8 +1,6 @@
use ArgumentType::*; use ArgumentType::*;
use Position::*; use Position::*;
use fmt_macros as parse;
use rustc_ast::ast; use rustc_ast::ast;
use rustc_ast::ptr::P; use rustc_ast::ptr::P;
use rustc_ast::token; use rustc_ast::token;
@ -10,6 +8,7 @@ use rustc_ast::tokenstream::TokenStream;
use rustc_data_structures::fx::{FxHashMap, FxHashSet}; use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_errors::{pluralize, Applicability, DiagnosticBuilder}; use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
use rustc_expand::base::{self, *}; use rustc_expand::base::{self, *};
use rustc_parse_format as parse;
use rustc_span::symbol::{sym, Ident, Symbol}; use rustc_span::symbol::{sym, Ident, Symbol};
use rustc_span::{MultiSpan, Span}; use rustc_span::{MultiSpan, Span};

2
src/librustc_codegen_llvm/Cargo.toml
View File

@ -29,7 +29,7 @@ rustc_incremental = { path = "../librustc_incremental" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_llvm = { path = "../librustc_llvm" } rustc_llvm = { path = "../librustc_llvm" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }

2
src/librustc_codegen_ssa/Cargo.toml
View File

@ -19,7 +19,7 @@ libc = "0.2.50"
jobserver = "0.1.11" jobserver = "0.1.11"
tempfile = "3.1" tempfile = "3.1"
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }

4
src/librustc_data_structures/Cargo.toml
View File

@ -16,8 +16,8 @@ log = "0.4"
jobserver_crate = { version = "0.1.13", package = "jobserver" } jobserver_crate = { version = "0.1.13", package = "jobserver" }
lazy_static = "1" lazy_static = "1"
once_cell = { version = "1", features = ["parking_lot"] } once_cell = { version = "1", features = ["parking_lot"] }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
graphviz = { path = "../libgraphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
cfg-if = "0.1.2" cfg-if = "0.1.2"
crossbeam-utils = { version = "0.7", features = ["nightly"] } crossbeam-utils = { version = "0.7", features = ["nightly"] }
stable_deref_trait = "1.0.0" stable_deref_trait = "1.0.0"

2
src/librustc_data_structures/obligation_forest/graphviz.rs
View File

@ -1,5 +1,5 @@
use crate::obligation_forest::{ForestObligation, ObligationForest}; use crate::obligation_forest::{ForestObligation, ObligationForest};
use graphviz as dot; use rustc_graphviz as dot;
use std::env::var_os; use std::env::var_os;
use std::fs::File; use std::fs::File;
use std::io::BufWriter; use std::io::BufWriter;

2
src/librustc_driver/Cargo.toml
View File

@ -32,7 +32,7 @@ rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_error_codes = { path = "../librustc_error_codes" } rustc_error_codes = { path = "../librustc_error_codes" }
rustc_interface = { path = "../librustc_interface" } rustc_interface = { path = "../librustc_interface" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }

2
src/librustc_errors/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
log = "0.4" log = "0.4"
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
unicode-width = "0.1.4" unicode-width = "0.1.4"

2
src/librustc_expand/Cargo.toml
View File

@ -11,7 +11,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
log = "0.4" log = "0.4"
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }

4
src/libgraphviz/Cargo.toml → src/librustc_graphviz/Cargo.toml
View File

@ -1,9 +1,9 @@
[package] [package]
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
name = "graphviz" name = "rustc_graphviz"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2018"
[lib] [lib]
name = "graphviz" name = "rustc_graphviz"
path = "lib.rs" path = "lib.rs"

6
src/libgraphviz/lib.rs → src/librustc_graphviz/lib.rs
View File

@ -40,7 +40,7 @@
//! #![feature(rustc_private)] //! #![feature(rustc_private)]
//! //!
//! use std::io::Write; //! use std::io::Write;
//! use graphviz as dot; //! use rustc_graphviz as dot;
//! //!
//! type Nd = isize; //! type Nd = isize;
//! type Ed = (isize,isize); //! type Ed = (isize,isize);
@ -145,7 +145,7 @@
//! #![feature(rustc_private)] //! #![feature(rustc_private)]
//! //!
//! use std::io::Write; //! use std::io::Write;
//! use graphviz as dot; //! use rustc_graphviz as dot;
//! //!
//! type Nd = usize; //! type Nd = usize;
//! type Ed<'a> = &'a (usize, usize); //! type Ed<'a> = &'a (usize, usize);
@ -207,7 +207,7 @@
//! #![feature(rustc_private)] //! #![feature(rustc_private)]
//! //!
//! use std::io::Write; //! use std::io::Write;
//! use graphviz as dot; //! use rustc_graphviz as dot;
//! //!
//! type Nd<'a> = (usize, &'a str); //! type Nd<'a> = (usize, &'a str);
//! type Ed<'a> = (Nd<'a>, Nd<'a>); //! type Ed<'a> = (Nd<'a>, Nd<'a>);

0
src/libgraphviz/tests.rs → src/librustc_graphviz/tests.rs
View File

2
src/librustc_hir/Cargo.toml
View File

@ -15,7 +15,7 @@ rustc_macros = { path = "../librustc_macros" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
lazy_static = "1" lazy_static = "1"
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { version = "0.4", features = ["release_max_level_info", "std"] }

4
src/librustc_incremental/Cargo.toml
View File

@ -10,13 +10,13 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
graphviz = { path = "../libgraphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
log = "0.4" log = "0.4"
rand = "0.7" rand = "0.7"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_hir = { path = "../librustc_hir" } rustc_hir = { path = "../librustc_hir" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_fs_util = { path = "../librustc_fs_util" } rustc_fs_util = { path = "../librustc_fs_util" }

2
src/librustc_incremental/assert_dep_graph.rs
View File

@ -33,10 +33,10 @@
//! fn baz() { foo(); } //! fn baz() { foo(); }
//! ``` //! ```
use graphviz as dot;
use rustc_ast::ast; use rustc_ast::ast;
use rustc_data_structures::fx::FxHashSet; use rustc_data_structures::fx::FxHashSet;
use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING}; use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING};
use rustc_graphviz as dot;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor}; use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};

2
src/librustc_index/Cargo.toml
View File

@ -10,5 +10,5 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }

4
src/librustc_infer/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
graphviz = { path = "../libgraphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { version = "0.4", features = ["release_max_level_info", "std"] }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
@ -19,7 +19,7 @@ rustc_hir = { path = "../librustc_hir" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_macros = { path = "../librustc_macros" } rustc_macros = { path = "../librustc_macros" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }

2
src/librustc_interface/Cargo.toml
View File

@ -21,7 +21,7 @@ rustc_expand = { path = "../librustc_expand" }
rustc_parse = { path = "../librustc_parse" } rustc_parse = { path = "../librustc_parse" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast_lowering = { path = "../librustc_ast_lowering" } rustc_ast_lowering = { path = "../librustc_ast_lowering" }
rustc_ast_passes = { path = "../librustc_ast_passes" } rustc_ast_passes = { path = "../librustc_ast_passes" }

2
src/librustc_metadata/Cargo.toml
View File

@ -23,7 +23,7 @@ rustc_hir = { path = "../librustc_hir" }
rustc_hir_pretty = { path = "../librustc_hir_pretty" } rustc_hir_pretty = { path = "../librustc_hir_pretty" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
stable_deref_trait = "1.0.0" stable_deref_trait = "1.0.0"
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_expand = { path = "../librustc_expand" } rustc_expand = { path = "../librustc_expand" }

4
src/librustc_middle/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
bitflags = "1.2.1" bitflags = "1.2.1"
scoped-tls = "1.0" scoped-tls = "1.0"
log = { version = "0.4", features = ["release_max_level_info", "std"] } 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_query_system = { path = "../librustc_query_system" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
byteorder = { version = "1.3" } byteorder = { version = "1.3" }

2
src/librustc_middle/arena.rs
View File

@ -88,4 +88,4 @@ macro_rules! arena_types {
) )
} }
arena_types!(arena::declare_arena, [], 'tcx); arena_types!(rustc_arena::declare_arena, [], 'tcx);

4
src/librustc_mir/Cargo.toml
View File

@ -11,7 +11,7 @@ doctest = false
[dependencies] [dependencies]
either = "1.5.0" either = "1.5.0"
dot = { path = "../libgraphviz", package = "graphviz" } rustc_graphviz = { path = "../librustc_graphviz" }
itertools = "0.8" itertools = "0.8"
log = "0.4" log = "0.4"
log_settings = "0.1.1" log_settings = "0.1.1"
@ -25,7 +25,7 @@ rustc_index = { path = "../librustc_index" }
rustc_infer = { path = "../librustc_infer" } rustc_infer = { path = "../librustc_infer" }
rustc_lexer = { path = "../librustc_lexer" } rustc_lexer = { path = "../librustc_lexer" }
rustc_macros = { path = "../librustc_macros" } rustc_macros = { path = "../librustc_macros" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }
rustc_trait_selection = { path = "../librustc_trait_selection" } rustc_trait_selection = { path = "../librustc_trait_selection" }

3
src/librustc_mir/borrow_check/region_infer/graphviz.rs
View File

@ -1,5 +1,5 @@
//! This module provides linkage between RegionInferenceContext and //! 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. //! data to rendered labels.
use std::borrow::Cow; use std::borrow::Cow;
@ -7,6 +7,7 @@ use std::io::{self, Write};
use super::*; use super::*;
use crate::borrow_check::constraints::OutlivesConstraint; use crate::borrow_check::constraints::OutlivesConstraint;
use rustc_graphviz as dot;
impl<'tcx> RegionInferenceContext<'tcx> { impl<'tcx> RegionInferenceContext<'tcx> {
/// Write out the region constraint graph. /// Write out the region constraint graph.

1
src/librustc_mir/dataflow/framework/engine.rs
View File

@ -6,6 +6,7 @@ use std::path::PathBuf;
use rustc_ast::ast; use rustc_ast::ast;
use rustc_data_structures::work_queue::WorkQueue; use rustc_data_structures::work_queue::WorkQueue;
use rustc_graphviz as dot;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_index::bit_set::BitSet; use rustc_index::bit_set::BitSet;
use rustc_index::vec::IndexVec; use rustc_index::vec::IndexVec;

1
src/librustc_mir/dataflow/framework/graphviz.rs
View File

@ -3,6 +3,7 @@
use std::cell::RefCell; use std::cell::RefCell;
use std::{io, ops, str}; use std::{io, ops, str};
use rustc_graphviz as dot;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_index::bit_set::{BitSet, HybridBitSet}; use rustc_index::bit_set::{BitSet, HybridBitSet};
use rustc_index::vec::{Idx, IndexVec}; use rustc_index::vec::{Idx, IndexVec};

3
src/librustc_mir/util/graphviz.rs
View File

@ -1,3 +1,4 @@
use rustc_graphviz as dot;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_index::vec::Idx; use rustc_index::vec::Idx;
use rustc_middle::mir::*; use rustc_middle::mir::*;
@ -76,7 +77,7 @@ where
/// Write a graphviz HTML-styled label for the given basic block, with /// Write a graphviz HTML-styled label for the given basic block, with
/// all necessary escaping already performed. (This is suitable for /// all necessary escaping already performed. (This is suitable for
/// emitting directly, as is done in this module, or for use with the /// 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 /// `init` and `fini` are callbacks for emitting additional rows of
/// data (using HTML enclosed with `<tr>` in the emitted text). /// data (using HTML enclosed with `<tr>` in the emitted text).

4
src/librustc_mir_build/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
log = "0.4" log = "0.4"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_apfloat = { path = "../librustc_apfloat" } rustc_apfloat = { path = "../librustc_apfloat" }
@ -20,7 +20,7 @@ rustc_index = { path = "../librustc_index" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_hir = { path = "../librustc_hir" } rustc_hir = { path = "../librustc_hir" }
rustc_infer = { path = "../librustc_infer" } rustc_infer = { path = "../librustc_infer" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_session = { path = "../librustc_session" } rustc_session = { path = "../librustc_session" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }

3
src/librustc_mir_build/hair/pattern/_match.rs
View File

@ -280,6 +280,7 @@ use rustc_index::vec::Idx;
use super::{compare_const_vals, PatternFoldable, PatternFolder}; use super::{compare_const_vals, PatternFoldable, PatternFolder};
use super::{FieldPat, Pat, PatKind, PatRange}; use super::{FieldPat, Pat, PatKind, PatRange};
use rustc_arena::TypedArena;
use rustc_attr::{SignedInt, UnsignedInt}; use rustc_attr::{SignedInt, UnsignedInt};
use rustc_errors::ErrorReported; use rustc_errors::ErrorReported;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
@ -292,8 +293,6 @@ use rustc_session::lint;
use rustc_span::{Span, DUMMY_SP}; use rustc_span::{Span, DUMMY_SP};
use rustc_target::abi::{Integer, Size, VariantIdx}; use rustc_target::abi::{Integer, Size, VariantIdx};
use arena::TypedArena;
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
use std::borrow::Cow; use std::borrow::Cow;
use std::cmp::{self, max, min, Ordering}; use std::cmp::{self, max, min, Ordering};

2
src/librustc_mir_build/hair/pattern/check_match.rs
View File

@ -3,7 +3,7 @@ use super::_match::WitnessPreference::*;
use super::_match::{expand_pattern, is_useful, MatchCheckCtxt, Matrix, PatStack}; use super::_match::{expand_pattern, is_useful, MatchCheckCtxt, Matrix, PatStack};
use super::{PatCtxt, PatKind, PatternError}; use super::{PatCtxt, PatKind, PatternError};
use arena::TypedArena; use rustc_arena::TypedArena;
use rustc_ast::ast::Mutability; use rustc_ast::ast::Mutability;
use rustc_errors::{error_code, struct_span_err, Applicability, DiagnosticBuilder}; use rustc_errors::{error_code, struct_span_err, Applicability, DiagnosticBuilder};
use rustc_hir as hir; use rustc_hir as hir;

4
src/libfmt_macros/Cargo.toml → src/librustc_parse_format/Cargo.toml
View File

@ -1,11 +1,11 @@
[package] [package]
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
name = "fmt_macros" name = "rustc_parse_format"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2018"
[lib] [lib]
name = "fmt_macros" name = "rustc_parse_format"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]

0
src/libfmt_macros/lib.rs → src/librustc_parse_format/lib.rs
View File

0
src/libfmt_macros/tests.rs → src/librustc_parse_format/tests.rs
View File

4
src/librustc_query_system/Cargo.toml
View File

@ -10,13 +10,13 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { version = "0.4", features = ["release_max_level_info", "std"] }
rustc-rayon-core = "0.3.0" rustc-rayon-core = "0.3.0"
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
parking_lot = "0.10" parking_lot = "0.10"
smallvec = { version = "1.0", features = ["union", "may_dangle"] } smallvec = { version = "1.0", features = ["union", "may_dangle"] }

2
src/librustc_query_system/query/caches.rs
View File

@ -2,7 +2,7 @@ use crate::dep_graph::DepNodeIndex;
use crate::query::plumbing::{QueryLookup, QueryState}; use crate::query::plumbing::{QueryLookup, QueryState};
use crate::query::QueryContext; use crate::query::QueryContext;
use arena::TypedArena; use rustc_arena::TypedArena;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::sharded::Sharded; use rustc_data_structures::sharded::Sharded;
use rustc_data_structures::sync::WorkerLocal; use rustc_data_structures::sync::WorkerLocal;

2
src/librustc_resolve/Cargo.toml
View File

@ -14,7 +14,7 @@ doctest = false
bitflags = "1.2.1" bitflags = "1.2.1"
log = "0.4" log = "0.4"
rustc_ast = { path = "../librustc_ast" } rustc_ast = { path = "../librustc_ast" }
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_ast_lowering = { path = "../librustc_ast_lowering" } rustc_ast_lowering = { path = "../librustc_ast_lowering" }
rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_ast_pretty = { path = "../librustc_ast_pretty" }

13
src/librustc_resolve/lib.rs
View File

@ -19,6 +19,7 @@ pub use rustc_hir::def::{Namespace, PerNS};
use Determinacy::*; use Determinacy::*;
use rustc_arena::TypedArena;
use rustc_ast::ast::{self, FloatTy, IntTy, NodeId, UintTy}; use rustc_ast::ast::{self, FloatTy, IntTy, NodeId, UintTy};
use rustc_ast::ast::{Crate, CRATE_NODE_ID}; use rustc_ast::ast::{Crate, CRATE_NODE_ID};
use rustc_ast::ast::{ItemKind, Path}; use rustc_ast::ast::{ItemKind, Path};
@ -981,13 +982,13 @@ pub struct Resolver<'a> {
/// Nothing really interesting here; it just provides memory for the rest of the crate. /// Nothing really interesting here; it just provides memory for the rest of the crate.
#[derive(Default)] #[derive(Default)]
pub struct ResolverArenas<'a> { pub struct ResolverArenas<'a> {
modules: arena::TypedArena<ModuleData<'a>>, modules: TypedArena<ModuleData<'a>>,
local_modules: RefCell<Vec<Module<'a>>>, local_modules: RefCell<Vec<Module<'a>>>,
name_bindings: arena::TypedArena<NameBinding<'a>>, name_bindings: TypedArena<NameBinding<'a>>,
imports: arena::TypedArena<Import<'a>>, imports: TypedArena<Import<'a>>,
name_resolutions: arena::TypedArena<RefCell<NameResolution<'a>>>, name_resolutions: TypedArena<RefCell<NameResolution<'a>>>,
macro_rules_bindings: arena::TypedArena<MacroRulesBinding<'a>>, macro_rules_bindings: TypedArena<MacroRulesBinding<'a>>,
ast_paths: arena::TypedArena<ast::Path>, ast_paths: TypedArena<ast::Path>,
} }
impl<'a> ResolverArenas<'a> { impl<'a> ResolverArenas<'a> {

4
src/libserialize/Cargo.toml → src/librustc_serialize/Cargo.toml
View File

@ -1,11 +1,11 @@
[package] [package]
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
name = "serialize" name = "rustc_serialize"
version = "0.0.0" version = "0.0.0"
edition = "2018" edition = "2018"
[lib] [lib]
name = "serialize" name = "rustc_serialize"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]

0
src/libserialize/collection_impls.rs → src/librustc_serialize/collection_impls.rs
View File

3
src/libserialize/json.rs → src/librustc_serialize/json.rs
View File

@ -68,7 +68,6 @@
//! //!
//! ```rust //! ```rust
//! # #![feature(rustc_private)] //! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize; // for the deriving below
//! use rustc_serialize::json; //! use rustc_serialize::json;
//! //!
//! // Automatically generate `Decodable` and `Encodable` trait implementations //! // Automatically generate `Decodable` and `Encodable` trait implementations
@ -103,7 +102,6 @@
//! //!
//! ```rust //! ```rust
//! # #![feature(rustc_private)] //! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize;
//! use rustc_serialize::json::{self, ToJson, Json}; //! use rustc_serialize::json::{self, ToJson, Json};
//! //!
//! // A custom data structure //! // A custom data structure
@ -143,7 +141,6 @@
//! //!
//! ```rust //! ```rust
//! # #![feature(rustc_private)] //! # #![feature(rustc_private)]
//! extern crate serialize as rustc_serialize;
//! use std::collections::BTreeMap; //! use std::collections::BTreeMap;
//! use rustc_serialize::json::{self, Json, ToJson}; //! use rustc_serialize::json::{self, Json, ToJson};
//! //!

0
src/libserialize/json/tests.rs → src/librustc_serialize/json/tests.rs
View File

0
src/libserialize/leb128.rs → src/librustc_serialize/leb128.rs
View File

0
src/libserialize/lib.rs → src/librustc_serialize/lib.rs
View File

0
src/libserialize/opaque.rs → src/librustc_serialize/opaque.rs
View File

0
src/libserialize/serialize.rs → src/librustc_serialize/serialize.rs
View File

2
src/libserialize/tests/json.rs → src/librustc_serialize/tests/json.rs
View File

@ -1,7 +1,5 @@
#![allow(rustc::internal)] #![allow(rustc::internal)]
extern crate serialize as rustc_serialize;
use json::DecoderError::*; use json::DecoderError::*;
use json::ErrorCode::*; use json::ErrorCode::*;
use json::Json::*; use json::Json::*;

1
src/libserialize/tests/leb128.rs → src/librustc_serialize/tests/leb128.rs
View File

@ -1,4 +1,3 @@
extern crate serialize as rustc_serialize;
use rustc_serialize::leb128::*; use rustc_serialize::leb128::*;
macro_rules! impl_test_unsigned_leb128 { macro_rules! impl_test_unsigned_leb128 {

2
src/libserialize/tests/opaque.rs → src/librustc_serialize/tests/opaque.rs
View File

@ -1,7 +1,5 @@
#![allow(rustc::internal)] #![allow(rustc::internal)]
extern crate serialize as rustc_serialize;
use rustc_serialize::opaque::{Decoder, Encoder}; use rustc_serialize::opaque::{Decoder, Encoder};
use rustc_serialize::{Decodable, Encodable}; use rustc_serialize::{Decodable, Encodable};
use std::fmt::Debug; use std::fmt::Debug;

2
src/librustc_session/Cargo.toml
View File

@ -14,7 +14,7 @@ log = "0.4"
rustc_errors = { path = "../librustc_errors" } rustc_errors = { path = "../librustc_errors" }
rustc_feature = { path = "../librustc_feature" } rustc_feature = { path = "../librustc_feature" }
rustc_target = { path = "../librustc_target" } rustc_target = { path = "../librustc_target" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_fs_util = { path = "../librustc_fs_util" } rustc_fs_util = { path = "../librustc_fs_util" }

4
src/librustc_span/Cargo.toml
View File

@ -10,11 +10,11 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_macros = { path = "../librustc_macros" } rustc_macros = { path = "../librustc_macros" }
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
scoped-tls = "1.0" scoped-tls = "1.0"
unicode-width = "0.1.4" unicode-width = "0.1.4"
cfg-if = "0.1.2" cfg-if = "0.1.2"

2
src/librustc_span/symbol.rs
View File

@ -2,7 +2,7 @@
//! allows bidirectional lookup; i.e., given a value, one can easily find the //! allows bidirectional lookup; i.e., given a value, one can easily find the
//! type, and vice versa. //! type, and vice versa.
use arena::DroplessArena; use rustc_arena::DroplessArena;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey}; use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
use rustc_macros::{symbols, HashStable_Generic}; use rustc_macros::{symbols, HashStable_Generic};

2
src/librustc_target/Cargo.toml
View File

@ -13,6 +13,6 @@ bitflags = "1.2.1"
log = "0.4" log = "0.4"
rustc_data_structures = { path = "../librustc_data_structures" } rustc_data_structures = { path = "../librustc_data_structures" }
rustc_macros = { path = "../librustc_macros" } rustc_macros = { path = "../librustc_macros" }
rustc_serialize = { path = "../libserialize", package = "serialize" } rustc_serialize = { path = "../librustc_serialize" }
rustc_span = { path = "../librustc_span" } rustc_span = { path = "../librustc_span" }
rustc_index = { path = "../librustc_index" } rustc_index = { path = "../librustc_index" }

2
src/librustc_trait_selection/Cargo.toml
View File

@ -10,7 +10,7 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
fmt_macros = { path = "../libfmt_macros" } rustc_parse_format = { path = "../librustc_parse_format" }
log = { version = "0.4", features = ["release_max_level_info", "std"] } log = { version = "0.4", features = ["release_max_level_info", "std"] }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }

3
src/librustc_trait_selection/traits/on_unimplemented.rs
View File

@ -1,11 +1,10 @@
use fmt_macros::{ParseMode, Parser, Piece, Position};
use rustc_ast::ast::{MetaItem, NestedMetaItem}; use rustc_ast::ast::{MetaItem, NestedMetaItem};
use rustc_attr as attr; use rustc_attr as attr;
use rustc_data_structures::fx::FxHashMap; use rustc_data_structures::fx::FxHashMap;
use rustc_errors::{struct_span_err, ErrorReported}; use rustc_errors::{struct_span_err, ErrorReported};
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::ty::{self, GenericParamDefKind, TyCtxt}; use rustc_middle::ty::{self, GenericParamDefKind, TyCtxt};
use rustc_parse_format::{ParseMode, Parser, Piece, Position};
use rustc_span::symbol::{kw, sym, Symbol}; use rustc_span::symbol::{kw, sym, Symbol};
use rustc_span::Span; use rustc_span::Span;

2
src/librustc_typeck/Cargo.toml
View File

@ -11,7 +11,7 @@ test = false
doctest = false doctest = false
[dependencies] [dependencies]
arena = { path = "../libarena" } rustc_arena = { path = "../librustc_arena" }
log = "0.4" log = "0.4"
rustc_middle = { path = "../librustc_middle" } rustc_middle = { path = "../librustc_middle" }
rustc_attr = { path = "../librustc_attr" } rustc_attr = { path = "../librustc_attr" }

3
src/librustc_typeck/variance/mod.rs
View File

@ -4,6 +4,7 @@
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/variance.html //! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/variance.html
use hir::Node; use hir::Node;
use rustc_arena::TypedArena;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE}; use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
use rustc_middle::ty::query::Providers; use rustc_middle::ty::query::Providers;
@ -31,7 +32,7 @@ pub fn provide(providers: &mut Providers<'_>) {
fn crate_variances(tcx: TyCtxt<'_>, crate_num: CrateNum) -> CrateVariancesMap<'_> { fn crate_variances(tcx: TyCtxt<'_>, crate_num: CrateNum) -> CrateVariancesMap<'_> {
assert_eq!(crate_num, LOCAL_CRATE); assert_eq!(crate_num, LOCAL_CRATE);
let mut arena = arena::TypedArena::default(); let mut arena = TypedArena::default();
let terms_cx = terms::determine_parameters_to_be_inferred(tcx, &mut arena); let terms_cx = terms::determine_parameters_to_be_inferred(tcx, &mut arena);
let constraints_cx = constraints::add_constraints_from_crate(terms_cx); let constraints_cx = constraints::add_constraints_from_crate(terms_cx);
solve::solve_constraints(constraints_cx) solve::solve_constraints(constraints_cx)

2
src/librustc_typeck/variance/terms.rs
View File

@ -9,7 +9,7 @@
// `InferredIndex` is a newtype'd int representing the index of such // `InferredIndex` is a newtype'd int representing the index of such
// a variable. // a variable.
use arena::TypedArena; use rustc_arena::TypedArena;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::itemlikevisit::ItemLikeVisitor; use rustc_hir::itemlikevisit::ItemLikeVisitor;
use rustc_hir::HirIdMap; use rustc_hir::HirIdMap;

2
src/test/run-make-fulldeps/pretty-expanded/input.rs
View File

@ -2,7 +2,7 @@
// #13544 // #13544
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
#[derive(RustcEncodable)] pub struct A; #[derive(RustcEncodable)] pub struct A;
#[derive(RustcEncodable)] pub struct B(isize); #[derive(RustcEncodable)] pub struct B(isize);

4
src/test/run-make-fulldeps/save-analysis-fail/foo.rs
View File

@ -2,13 +2,13 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate graphviz; extern crate rustc_graphviz;
// A simple rust project // A simple rust project
extern crate krate2; extern crate krate2;
extern crate krate2 as krate3; extern crate krate2 as krate3;
use graphviz::RenderOption; use rustc_graphviz::RenderOption;
use std::collections::{HashMap,HashSet}; use std::collections::{HashMap,HashSet};
use std::cell::RefCell; use std::cell::RefCell;
use std::io::Write; use std::io::Write;

8
src/test/run-make-fulldeps/save-analysis/foo.rs
View File

@ -4,13 +4,13 @@
#![feature(associated_type_defaults)] #![feature(associated_type_defaults)]
#![feature(external_doc)] #![feature(external_doc)]
extern crate graphviz; extern crate rustc_graphviz;
// A simple rust project // A simple rust project
extern crate krate2; extern crate krate2;
extern crate krate2 as krate3; extern crate krate2 as krate3;
use graphviz::RenderOption; use rustc_graphviz::RenderOption;
use std::collections::{HashMap,HashSet}; use std::collections::{HashMap,HashSet};
use std::cell::RefCell; use std::cell::RefCell;
use std::io::Write; use std::io::Write;
@ -27,7 +27,7 @@ use std::char::from_u32;
static uni: &'static str = "Les Miséééééééérables"; static uni: &'static str = "Les Miséééééééérables";
static yy: usize = 25; static yy: usize = 25;
static bob: Option<graphviz::RenderOption> = None; static bob: Option<rustc_graphviz::RenderOption> = None;
// buglink test - see issue #1337. // buglink test - see issue #1337.
@ -418,7 +418,7 @@ impl Error + 'static + Send {
<Error + 'static>::is::<T>(self) <Error + 'static>::is::<T>(self)
} }
} }
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
#[derive(Clone, Copy, Hash, RustcEncodable, RustcDecodable, #[derive(Clone, Copy, Hash, RustcEncodable, RustcDecodable,
PartialEq, Eq, PartialOrd, Ord, Debug, Default)] PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
struct AllDerives(i32); struct AllDerives(i32);

2
src/test/ui-fulldeps/derive-no-std-not-supported.rs
View File

@ -4,7 +4,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![no_std] #![no_std]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
#[derive(RustcEncodable)] #[derive(RustcEncodable)]
struct Bar { struct Bar {

2
src/test/ui-fulldeps/deriving-encodable-decodable-box.rs
View File

@ -5,7 +5,7 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
use rustc_serialize::{Encodable, Decodable}; use rustc_serialize::{Encodable, Decodable};
use rustc_serialize::json; use rustc_serialize::json;

2
src/test/ui-fulldeps/deriving-encodable-decodable-cell-refcell.rs
View File

@ -7,7 +7,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use rustc_serialize::{Encodable, Decodable}; use rustc_serialize::{Encodable, Decodable};

2
src/test/ui-fulldeps/deriving-global.rs
View File

@ -2,7 +2,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
mod submod { mod submod {
// if any of these are implemented without global calls for any // if any of these are implemented without global calls for any

2
src/test/ui-fulldeps/deriving-hygiene.rs
View File

@ -2,7 +2,7 @@
#![allow(non_upper_case_globals)] #![allow(non_upper_case_globals)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
pub const other: u8 = 1; pub const other: u8 = 1;
pub const f: u8 = 1; pub const f: u8 = 1;

4
src/test/ui-fulldeps/dropck-tarena-cycle-checked.rs
View File

@ -8,9 +8,9 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate arena; extern crate rustc_arena;
use arena::TypedArena; use rustc_arena::TypedArena;
use std::cell::Cell; use std::cell::Cell;
use id::Id; use id::Id;

2
src/test/ui-fulldeps/dropck-tarena-cycle-checked.stderr
View File

@ -7,7 +7,7 @@ LL | }
| - | -
| | | |
| `arena` dropped here while still borrowed | `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena` | borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`
error: aborting due to previous error error: aborting due to previous error

4
src/test/ui-fulldeps/dropck-tarena-unsound-drop.rs
View File

@ -11,9 +11,9 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate arena; extern crate rustc_arena;
use arena::TypedArena; use rustc_arena::TypedArena;
trait HasId { fn count(&self) -> usize; } trait HasId { fn count(&self) -> usize; }

2
src/test/ui-fulldeps/dropck-tarena-unsound-drop.stderr
View File

@ -7,7 +7,7 @@ LL | }
| - | -
| | | |
| `arena` dropped here while still borrowed | `arena` dropped here while still borrowed
| borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `arena::TypedArena` | borrow might be used here, when `arena` is dropped and runs the `Drop` code for type `rustc_arena::TypedArena`
error: aborting due to previous error error: aborting due to previous error

4
src/test/ui-fulldeps/dropck_tarena_sound_drop.rs
View File

@ -12,9 +12,9 @@
#![allow(unstable)] #![allow(unstable)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate arena; extern crate rustc_arena;
use arena::TypedArena; use rustc_arena::TypedArena;
trait HasId { fn count(&self) -> usize; } trait HasId { fn count(&self) -> usize; }

2
src/test/ui-fulldeps/empty-struct-braces-derive.rs
View File

@ -3,7 +3,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash,
Default, Debug, RustcEncodable, RustcDecodable)] Default, Debug, RustcEncodable, RustcDecodable)]

4
src/test/ui-fulldeps/extern-mod-syntax.rs
View File

@ -3,8 +3,8 @@
#![allow(unused_imports)] #![allow(unused_imports)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use serialize::json::Object; use rustc_serialize::json::Object;
pub fn main() { pub fn main() {
println!("Hello world!"); println!("Hello world!");

2
src/test/ui-fulldeps/issue-11881.rs
View File

@ -6,7 +6,7 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
use std::io::Cursor; use std::io::Cursor;
use std::io::prelude::*; use std::io::prelude::*;

7
src/test/ui-fulldeps/issue-14021.rs
View File

@ -4,11 +4,10 @@
#![allow(unused_imports)] #![allow(unused_imports)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
extern crate serialize as rustc_serialize;
use serialize::{Encodable, Decodable}; use rustc_serialize::{Encodable, Decodable};
use serialize::json; use rustc_serialize::json;
#[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)] #[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)]
struct UnitLikeStruct; struct UnitLikeStruct;

6
src/test/ui-fulldeps/issue-15924.rs
View File

@ -6,11 +6,11 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use std::fmt; use std::fmt;
use serialize::{Encoder, Encodable}; use rustc_serialize::{Encoder, Encodable};
use serialize::json; use rustc_serialize::json;
struct Foo<T: Encodable> { struct Foo<T: Encodable> {
v: T, v: T,

4
src/test/ui-fulldeps/issue-24972.rs
View File

@ -3,9 +3,9 @@
#![allow(dead_code)] #![allow(dead_code)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use serialize::{Encodable, Decodable}; use rustc_serialize::{Encodable, Decodable};
use std::fmt::Display; use std::fmt::Display;
pub trait Entity : Decodable + Encodable + Sized { pub trait Entity : Decodable + Encodable + Sized {

4
src/test/ui-fulldeps/issue-2804.rs
View File

@ -4,10 +4,10 @@
#![allow(dead_code)] #![allow(dead_code)]
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use std::collections::HashMap; use std::collections::HashMap;
use serialize::json::{self, Json}; use rustc_serialize::json::{self, Json};
use std::option; use std::option;
enum object { enum object {

4
src/test/ui-fulldeps/issue-4016.rs
View File

@ -4,9 +4,9 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use serialize::{json, Decodable}; use rustc_serialize::{json, Decodable};
trait JD : Decodable {} trait JD : Decodable {}

4
src/test/ui-fulldeps/issue-4036.rs
View File

@ -6,9 +6,9 @@
#![feature(rustc_private)] #![feature(rustc_private)]
extern crate serialize; extern crate rustc_serialize;
use serialize::{json, Decodable}; use rustc_serialize::{json, Decodable};
pub fn main() { pub fn main() {
let json = json::from_str("[1]").unwrap(); let json = json::from_str("[1]").unwrap();

4
src/test/ui-fulldeps/regions-mock-tcx.rs
View File

@ -11,12 +11,12 @@
#![feature(rustc_private, libc)] #![feature(rustc_private, libc)]
extern crate arena; extern crate rustc_arena;
extern crate libc; extern crate libc;
use TypeStructure::{TypeInt, TypeFunction}; use TypeStructure::{TypeInt, TypeFunction};
use AstKind::{ExprInt, ExprVar, ExprLambda}; use AstKind::{ExprInt, ExprVar, ExprLambda};
use arena::TypedArena; use rustc_arena::TypedArena;
use std::collections::HashMap; use std::collections::HashMap;
use std::mem; use std::mem;

2
src/test/ui-fulldeps/rustc_encodable_hygiene.rs
View File

@ -4,7 +4,7 @@
#[allow(dead_code)] #[allow(dead_code)]
extern crate serialize as rustc_serialize; extern crate rustc_serialize;
#[derive(RustcDecodable, RustcEncodable,Debug)] #[derive(RustcDecodable, RustcEncodable,Debug)]
struct A { struct A {

4
src/tools/clippy/clippy_lints/src/lib.rs
View File

@ -16,8 +16,6 @@
// FIXME: switch to something more ergonomic here, once available. // FIXME: switch to something more ergonomic here, once available.
// (Currently there is no way to opt into sysroot crates without `extern crate`.) // (Currently there is no way to opt into sysroot crates without `extern crate`.)
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate fmt_macros;
#[allow(unused_extern_crates)]
extern crate rustc_ast; extern crate rustc_ast;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate rustc_ast_pretty; extern crate rustc_ast_pretty;
@ -48,6 +46,8 @@ extern crate rustc_mir;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate rustc_parse; extern crate rustc_parse;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate rustc_parse_format;
#[allow(unused_extern_crates)]
extern crate rustc_session; extern crate rustc_session;
#[allow(unused_extern_crates)] #[allow(unused_extern_crates)]
extern crate rustc_span; extern crate rustc_span;

2
src/tools/clippy/clippy_lints/src/write.rs
View File

@ -352,7 +352,7 @@ impl Write {
tts: &TokenStream, tts: &TokenStream,
is_write: bool, is_write: bool,
) -> (Option<StrLit>, Option<Expr>) { ) -> (Option<StrLit>, Option<Expr>) {
use fmt_macros::{ use rustc_parse_format::{
AlignUnknown, ArgumentImplicitlyIs, ArgumentIs, ArgumentNamed, CountImplied, FormatSpec, ParseMode, Parser, AlignUnknown, ArgumentImplicitlyIs, ArgumentIs, ArgumentNamed, CountImplied, FormatSpec, ParseMode, Parser,
Piece, Piece,
}; };