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
commit
118b50524b
124
Cargo.lock
124
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"
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_arena" }
|
||||
log = { version = "0.4", features = ["release_max_level_info", "std"] }
|
||||
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
|
||||
rustc_hir = { path = "../librustc_hir" }
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ mod path;
|
|||
|
||||
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> {
|
||||
crate_root: Option<Symbol>,
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
fmt_macros = { path = "../libfmt_macros" }
|
||||
rustc_parse_format = { path = "../librustc_parse_format" }
|
||||
log = "0.4"
|
||||
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
|
||||
rustc_attr = { path = "../librustc_attr" }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
use fmt_macros as parse;
|
||||
|
||||
use rustc_ast::ast;
|
||||
use rustc_ast::ptr::P;
|
||||
use rustc_ast::token;
|
||||
|
|
@ -8,6 +6,7 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
|||
use rustc_errors::{Applicability, DiagnosticBuilder};
|
||||
use rustc_expand::base::{self, *};
|
||||
use rustc_parse::parser::Parser;
|
||||
use rustc_parse_format as parse;
|
||||
use rustc_span::symbol::{kw, sym, Symbol};
|
||||
use rustc_span::{InnerSpan, Span};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
use ArgumentType::*;
|
||||
use Position::*;
|
||||
|
||||
use fmt_macros as parse;
|
||||
|
||||
use rustc_ast::ast;
|
||||
use rustc_ast::ptr::P;
|
||||
use rustc_ast::token;
|
||||
|
|
@ -10,6 +8,7 @@ use rustc_ast::tokenstream::TokenStream;
|
|||
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
|
||||
use rustc_errors::{pluralize, Applicability, DiagnosticBuilder};
|
||||
use rustc_expand::base::{self, *};
|
||||
use rustc_parse_format as parse;
|
||||
use rustc_span::symbol::{sym, Ident, Symbol};
|
||||
use rustc_span::{MultiSpan, Span};
|
||||
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
rustc_graphviz = { path = "../librustc_graphviz" }
|
||||
cfg-if = "0.1.2"
|
||||
crossbeam-utils = { version = "0.7", features = ["nightly"] }
|
||||
stable_deref_trait = "1.0.0"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
use crate::obligation_forest::{ForestObligation, ObligationForest};
|
||||
use graphviz as dot;
|
||||
use rustc_graphviz as dot;
|
||||
use std::env::var_os;
|
||||
use std::fs::File;
|
||||
use std::io::BufWriter;
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
//! #![feature(rustc_private)]
|
||||
//!
|
||||
//! use std::io::Write;
|
||||
//! use graphviz as dot;
|
||||
//! use rustc_graphviz as dot;
|
||||
//!
|
||||
//! type Nd = isize;
|
||||
//! type Ed = (isize,isize);
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
//! #![feature(rustc_private)]
|
||||
//!
|
||||
//! use std::io::Write;
|
||||
//! use graphviz as dot;
|
||||
//! use rustc_graphviz as dot;
|
||||
//!
|
||||
//! type Nd = usize;
|
||||
//! type Ed<'a> = &'a (usize, usize);
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
//! #![feature(rustc_private)]
|
||||
//!
|
||||
//! use std::io::Write;
|
||||
//! use graphviz as dot;
|
||||
//! use rustc_graphviz as dot;
|
||||
//!
|
||||
//! type Nd<'a> = (usize, &'a str);
|
||||
//! type Ed<'a> = (Nd<'a>, Nd<'a>);
|
||||
|
|
@ -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"] }
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
graphviz = { path = "../libgraphviz" }
|
||||
rustc_graphviz = { path = "../librustc_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" }
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@
|
|||
//! fn baz() { foo(); }
|
||||
//! ```
|
||||
|
||||
use graphviz as dot;
|
||||
use rustc_ast::ast;
|
||||
use rustc_data_structures::fx::FxHashSet;
|
||||
use rustc_data_structures::graph::implementation::{Direction, NodeIndex, INCOMING, OUTGOING};
|
||||
use rustc_graphviz as dot;
|
||||
use rustc_hir as hir;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_hir::intravisit::{self, NestedVisitorMap, Visitor};
|
||||
|
|
|
|||
|
|
@ -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"] }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
graphviz = { path = "../libgraphviz" }
|
||||
rustc_graphviz = { path = "../librustc_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"] }
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_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" }
|
||||
|
|
|
|||
|
|
@ -88,4 +88,4 @@ macro_rules! arena_types {
|
|||
)
|
||||
}
|
||||
|
||||
arena_types!(arena::declare_arena, [], 'tcx);
|
||||
arena_types!(rustc_arena::declare_arena, [], 'tcx);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ doctest = false
|
|||
|
||||
[dependencies]
|
||||
either = "1.5.0"
|
||||
dot = { path = "../libgraphviz", package = "graphviz" }
|
||||
rustc_graphviz = { path = "../librustc_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" }
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
@ -7,6 +7,7 @@ use std::io::{self, Write};
|
|||
|
||||
use super::*;
|
||||
use crate::borrow_check::constraints::OutlivesConstraint;
|
||||
use rustc_graphviz as dot;
|
||||
|
||||
impl<'tcx> RegionInferenceContext<'tcx> {
|
||||
/// Write out the region constraint graph.
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ use std::path::PathBuf;
|
|||
|
||||
use rustc_ast::ast;
|
||||
use rustc_data_structures::work_queue::WorkQueue;
|
||||
use rustc_graphviz as dot;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_index::bit_set::BitSet;
|
||||
use rustc_index::vec::IndexVec;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
use std::cell::RefCell;
|
||||
use std::{io, ops, str};
|
||||
|
||||
use rustc_graphviz as dot;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_index::bit_set::{BitSet, HybridBitSet};
|
||||
use rustc_index::vec::{Idx, IndexVec};
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
use rustc_graphviz as dot;
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_index::vec::Idx;
|
||||
use rustc_middle::mir::*;
|
||||
|
|
@ -76,7 +77,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 `<tr>` in the emitted text).
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_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" }
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ use rustc_index::vec::Idx;
|
|||
use super::{compare_const_vals, PatternFoldable, PatternFolder};
|
||||
use super::{FieldPat, Pat, PatKind, PatRange};
|
||||
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_attr::{SignedInt, UnsignedInt};
|
||||
use rustc_errors::ErrorReported;
|
||||
use rustc_hir::def_id::DefId;
|
||||
|
|
@ -292,8 +293,6 @@ use rustc_session::lint;
|
|||
use rustc_span::{Span, DUMMY_SP};
|
||||
use rustc_target::abi::{Integer, Size, VariantIdx};
|
||||
|
||||
use arena::TypedArena;
|
||||
|
||||
use smallvec::{smallvec, SmallVec};
|
||||
use std::borrow::Cow;
|
||||
use std::cmp::{self, max, min, Ordering};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ use super::_match::WitnessPreference::*;
|
|||
use super::_match::{expand_pattern, is_useful, MatchCheckCtxt, Matrix, PatStack};
|
||||
use super::{PatCtxt, PatKind, PatternError};
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_ast::ast::Mutability;
|
||||
use rustc_errors::{error_code, struct_span_err, Applicability, DiagnosticBuilder};
|
||||
use rustc_hir as hir;
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
@ -10,13 +10,13 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_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"] }
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use crate::dep_graph::DepNodeIndex;
|
|||
use crate::query::plumbing::{QueryLookup, QueryState};
|
||||
use crate::query::QueryContext;
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::sharded::Sharded;
|
||||
use rustc_data_structures::sync::WorkerLocal;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ doctest = false
|
|||
bitflags = "1.2.1"
|
||||
log = "0.4"
|
||||
rustc_ast = { path = "../librustc_ast" }
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_arena" }
|
||||
rustc_middle = { path = "../librustc_middle" }
|
||||
rustc_ast_lowering = { path = "../librustc_ast_lowering" }
|
||||
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ pub use rustc_hir::def::{Namespace, PerNS};
|
|||
|
||||
use Determinacy::*;
|
||||
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_ast::ast::{self, FloatTy, IntTy, NodeId, UintTy};
|
||||
use rustc_ast::ast::{Crate, CRATE_NODE_ID};
|
||||
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.
|
||||
#[derive(Default)]
|
||||
pub struct ResolverArenas<'a> {
|
||||
modules: arena::TypedArena<ModuleData<'a>>,
|
||||
modules: TypedArena<ModuleData<'a>>,
|
||||
local_modules: RefCell<Vec<Module<'a>>>,
|
||||
name_bindings: arena::TypedArena<NameBinding<'a>>,
|
||||
imports: arena::TypedArena<Import<'a>>,
|
||||
name_resolutions: arena::TypedArena<RefCell<NameResolution<'a>>>,
|
||||
macro_rules_bindings: arena::TypedArena<MacroRulesBinding<'a>>,
|
||||
ast_paths: arena::TypedArena<ast::Path>,
|
||||
name_bindings: TypedArena<NameBinding<'a>>,
|
||||
imports: TypedArena<Import<'a>>,
|
||||
name_resolutions: TypedArena<RefCell<NameResolution<'a>>>,
|
||||
macro_rules_bindings: TypedArena<MacroRulesBinding<'a>>,
|
||||
ast_paths: TypedArena<ast::Path>,
|
||||
}
|
||||
|
||||
impl<'a> ResolverArenas<'a> {
|
||||
|
|
|
|||
|
|
@ -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]
|
||||
|
|
@ -68,7 +68,6 @@
|
|||
//!
|
||||
//! ```rust
|
||||
//! # #![feature(rustc_private)]
|
||||
//! extern crate serialize as rustc_serialize; // for the deriving below
|
||||
//! use rustc_serialize::json;
|
||||
//!
|
||||
//! // Automatically generate `Decodable` and `Encodable` trait implementations
|
||||
|
|
@ -103,7 +102,6 @@
|
|||
//!
|
||||
//! ```rust
|
||||
//! # #![feature(rustc_private)]
|
||||
//! extern crate serialize as rustc_serialize;
|
||||
//! use rustc_serialize::json::{self, ToJson, Json};
|
||||
//!
|
||||
//! // A custom data structure
|
||||
|
|
@ -143,7 +141,6 @@
|
|||
//!
|
||||
//! ```rust
|
||||
//! # #![feature(rustc_private)]
|
||||
//! extern crate serialize as rustc_serialize;
|
||||
//! use std::collections::BTreeMap;
|
||||
//! use rustc_serialize::json::{self, Json, ToJson};
|
||||
//!
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
#![allow(rustc::internal)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
|
||||
use json::DecoderError::*;
|
||||
use json::ErrorCode::*;
|
||||
use json::Json::*;
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
extern crate serialize as rustc_serialize;
|
||||
use rustc_serialize::leb128::*;
|
||||
|
||||
macro_rules! impl_test_unsigned_leb128 {
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
#![allow(rustc::internal)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
|
||||
use rustc_serialize::opaque::{Decoder, Encoder};
|
||||
use rustc_serialize::{Decodable, Encodable};
|
||||
use std::fmt::Debug;
|
||||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
rustc_arena = { path = "../librustc_arena" }
|
||||
scoped-tls = "1.0"
|
||||
unicode-width = "0.1.4"
|
||||
cfg-if = "0.1.2"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
//! allows bidirectional lookup; i.e., given a value, one can easily find the
|
||||
//! type, and vice versa.
|
||||
|
||||
use arena::DroplessArena;
|
||||
use rustc_arena::DroplessArena;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
|
||||
use rustc_macros::{symbols, HashStable_Generic};
|
||||
|
|
|
|||
|
|
@ -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" }
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ path = "lib.rs"
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
fmt_macros = { path = "../libfmt_macros" }
|
||||
rustc_parse_format = { path = "../librustc_parse_format" }
|
||||
log = { version = "0.4", features = ["release_max_level_info", "std"] }
|
||||
rustc_attr = { path = "../librustc_attr" }
|
||||
rustc_middle = { path = "../librustc_middle" }
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
use fmt_macros::{ParseMode, Parser, Piece, Position};
|
||||
|
||||
use rustc_ast::ast::{MetaItem, NestedMetaItem};
|
||||
use rustc_attr as attr;
|
||||
use rustc_data_structures::fx::FxHashMap;
|
||||
use rustc_errors::{struct_span_err, ErrorReported};
|
||||
use rustc_hir::def_id::DefId;
|
||||
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::Span;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ test = false
|
|||
doctest = false
|
||||
|
||||
[dependencies]
|
||||
arena = { path = "../libarena" }
|
||||
rustc_arena = { path = "../librustc_arena" }
|
||||
log = "0.4"
|
||||
rustc_middle = { path = "../librustc_middle" }
|
||||
rustc_attr = { path = "../librustc_attr" }
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/variance.html
|
||||
|
||||
use hir::Node;
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_hir as hir;
|
||||
use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
|
||||
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<'_> {
|
||||
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 constraints_cx = constraints::add_constraints_from_crate(terms_cx);
|
||||
solve::solve_constraints(constraints_cx)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
// `InferredIndex` is a newtype'd int representing the index of such
|
||||
// a variable.
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
use rustc_hir as hir;
|
||||
use rustc_hir::itemlikevisit::ItemLikeVisitor;
|
||||
use rustc_hir::HirIdMap;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// #13544
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
#[derive(RustcEncodable)] pub struct A;
|
||||
#[derive(RustcEncodable)] pub struct B(isize);
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
#![feature(box_syntax)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate graphviz;
|
||||
extern crate rustc_graphviz;
|
||||
// A simple rust project
|
||||
|
||||
extern crate krate2;
|
||||
extern crate krate2 as krate3;
|
||||
|
||||
use graphviz::RenderOption;
|
||||
use rustc_graphviz::RenderOption;
|
||||
use std::collections::{HashMap,HashSet};
|
||||
use std::cell::RefCell;
|
||||
use std::io::Write;
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
#![feature(associated_type_defaults)]
|
||||
#![feature(external_doc)]
|
||||
|
||||
extern crate graphviz;
|
||||
extern crate rustc_graphviz;
|
||||
// A simple rust project
|
||||
|
||||
extern crate krate2;
|
||||
extern crate krate2 as krate3;
|
||||
|
||||
use graphviz::RenderOption;
|
||||
use rustc_graphviz::RenderOption;
|
||||
use std::collections::{HashMap,HashSet};
|
||||
use std::cell::RefCell;
|
||||
use std::io::Write;
|
||||
|
|
@ -27,7 +27,7 @@ use std::char::from_u32;
|
|||
static uni: &'static str = "Les Miséééééééérables";
|
||||
static yy: usize = 25;
|
||||
|
||||
static bob: Option<graphviz::RenderOption> = None;
|
||||
static bob: Option<rustc_graphviz::RenderOption> = None;
|
||||
|
||||
// buglink test - see issue #1337.
|
||||
|
||||
|
|
@ -418,7 +418,7 @@ impl Error + 'static + Send {
|
|||
<Error + 'static>::is::<T>(self)
|
||||
}
|
||||
}
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
#[derive(Clone, Copy, Hash, RustcEncodable, RustcDecodable,
|
||||
PartialEq, Eq, PartialOrd, Ord, Debug, Default)]
|
||||
struct AllDerives(i32);
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#![feature(rustc_private)]
|
||||
#![no_std]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
#[derive(RustcEncodable)]
|
||||
struct Bar {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#![feature(box_syntax)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use rustc_serialize::{Encodable, Decodable};
|
||||
use rustc_serialize::json;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use std::cell::{Cell, RefCell};
|
||||
use rustc_serialize::{Encodable, Decodable};
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
mod submod {
|
||||
// if any of these are implemented without global calls for any
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#![allow(non_upper_case_globals)]
|
||||
#![feature(rustc_private)]
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
pub const other: u8 = 1;
|
||||
pub const f: u8 = 1;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate arena;
|
||||
extern crate rustc_arena;
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
use std::cell::Cell;
|
||||
use id::Id;
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ LL | }
|
|||
| -
|
||||
| |
|
||||
| `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
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate arena;
|
||||
extern crate rustc_arena;
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
|
||||
trait HasId { fn count(&self) -> usize; }
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ LL | }
|
|||
| -
|
||||
| |
|
||||
| `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
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
#![allow(unstable)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate arena;
|
||||
extern crate rustc_arena;
|
||||
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
|
||||
trait HasId { fn count(&self) -> usize; }
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash,
|
||||
Default, Debug, RustcEncodable, RustcDecodable)]
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
#![allow(unused_imports)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
use serialize::json::Object;
|
||||
extern crate rustc_serialize;
|
||||
use rustc_serialize::json::Object;
|
||||
|
||||
pub fn main() {
|
||||
println!("Hello world!");
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use std::io::Cursor;
|
||||
use std::io::prelude::*;
|
||||
|
|
|
|||
|
|
@ -4,11 +4,10 @@
|
|||
#![allow(unused_imports)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use serialize::{Encodable, Decodable};
|
||||
use serialize::json;
|
||||
use rustc_serialize::{Encodable, Decodable};
|
||||
use rustc_serialize::json;
|
||||
|
||||
#[derive(RustcEncodable, RustcDecodable, PartialEq, Debug)]
|
||||
struct UnitLikeStruct;
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use std::fmt;
|
||||
use serialize::{Encoder, Encodable};
|
||||
use serialize::json;
|
||||
use rustc_serialize::{Encoder, Encodable};
|
||||
use rustc_serialize::json;
|
||||
|
||||
struct Foo<T: Encodable> {
|
||||
v: T,
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
#![allow(dead_code)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use serialize::{Encodable, Decodable};
|
||||
use rustc_serialize::{Encodable, Decodable};
|
||||
use std::fmt::Display;
|
||||
|
||||
pub trait Entity : Decodable + Encodable + Sized {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
#![allow(dead_code)]
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use std::collections::HashMap;
|
||||
use serialize::json::{self, Json};
|
||||
use rustc_serialize::json::{self, Json};
|
||||
use std::option;
|
||||
|
||||
enum object {
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use serialize::{json, Decodable};
|
||||
use rustc_serialize::{json, Decodable};
|
||||
|
||||
trait JD : Decodable {}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#![feature(rustc_private)]
|
||||
|
||||
extern crate serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
use serialize::{json, Decodable};
|
||||
use rustc_serialize::{json, Decodable};
|
||||
|
||||
pub fn main() {
|
||||
let json = json::from_str("[1]").unwrap();
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
#![feature(rustc_private, libc)]
|
||||
|
||||
extern crate arena;
|
||||
extern crate rustc_arena;
|
||||
extern crate libc;
|
||||
|
||||
use TypeStructure::{TypeInt, TypeFunction};
|
||||
use AstKind::{ExprInt, ExprVar, ExprLambda};
|
||||
use arena::TypedArena;
|
||||
use rustc_arena::TypedArena;
|
||||
use std::collections::HashMap;
|
||||
use std::mem;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#[allow(dead_code)]
|
||||
|
||||
extern crate serialize as rustc_serialize;
|
||||
extern crate rustc_serialize;
|
||||
|
||||
#[derive(RustcDecodable, RustcEncodable,Debug)]
|
||||
struct A {
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
// FIXME: switch to something more ergonomic here, once available.
|
||||
// (Currently there is no way to opt into sysroot crates without `extern crate`.)
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate fmt_macros;
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_ast;
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_ast_pretty;
|
||||
|
|
@ -48,6 +46,8 @@ extern crate rustc_mir;
|
|||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_parse;
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_parse_format;
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_session;
|
||||
#[allow(unused_extern_crates)]
|
||||
extern crate rustc_span;
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ impl Write {
|
|||
tts: &TokenStream,
|
||||
is_write: bool,
|
||||
) -> (Option<StrLit>, Option<Expr>) {
|
||||
use fmt_macros::{
|
||||
use rustc_parse_format::{
|
||||
AlignUnknown, ArgumentImplicitlyIs, ArgumentIs, ArgumentNamed, CountImplied, FormatSpec, ParseMode, Parser,
|
||||
Piece,
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue