diff options
| -rw-r--r-- | Cargo.lock | 10 | ||||
| -rw-r--r-- | src/librustc/Cargo.toml | 3 | ||||
| -rw-r--r-- | src/librustc/ty/mod.rs | 7 | ||||
| -rw-r--r-- | src/librustc/ty/structural_impls.rs | 6 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_driver/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/librustc_lint/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/librustc_typeck/check/upvar.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/rustc/Cargo.toml | 1 |
10 files changed, 1 insertions, 34 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4f60ea30519..2a222381491 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3079,8 +3079,6 @@ dependencies = [ "graphviz", "jobserver", "log", - "measureme", - "num_cpus", "parking_lot", "polonius-engine", "rustc-rayon", @@ -3090,7 +3088,6 @@ dependencies = [ "rustc_error_codes", "rustc_errors", "rustc_feature", - "rustc_fs_util", "rustc_hir", "rustc_index", "rustc_macros", @@ -3278,7 +3275,6 @@ dependencies = [ "jemalloc-sys", "rustc_codegen_ssa", "rustc_driver", - "rustc_target", ] [[package]] @@ -3409,7 +3405,6 @@ dependencies = [ "rustc_codegen_utils", "rustc_data_structures", "rustc_errors", - "rustc_expand", "rustc_feature", "rustc_fs_util", "rustc_hir", @@ -3497,7 +3492,6 @@ name = "rustc_driver" version = "0.0.0" dependencies = [ "env_logger 0.7.1", - "graphviz", "lazy_static 1.3.0", "log", "rustc", @@ -3513,7 +3507,6 @@ dependencies = [ "rustc_mir", "rustc_parse", "rustc_plugin_impl", - "rustc_resolve", "rustc_save_analysis", "rustc_span", "rustc_target", @@ -3660,7 +3653,6 @@ dependencies = [ "log", "rustc", "rustc_data_structures", - "rustc_error_codes", "rustc_feature", "rustc_hir", "rustc_index", @@ -4464,8 +4456,6 @@ dependencies = [ name = "syntax" version = "0.0.0" dependencies = [ - "bitflags", - "lazy_static 1.3.0", "log", "rustc_data_structures", "rustc_error_codes", diff --git a/src/librustc/Cargo.toml b/src/librustc/Cargo.toml index 2e882cfdafd..1a04a9d86b5 100644 --- a/src/librustc/Cargo.toml +++ b/src/librustc/Cargo.toml @@ -15,7 +15,6 @@ bitflags = "1.2.1" fmt_macros = { path = "../libfmt_macros" } graphviz = { path = "../libgraphviz" } jobserver = "0.1" -num_cpus = "1.0" scoped-tls = "1.0" log = { version = "0.4", features = ["release_max_level_info", "std"] } rustc-rayon = "0.3.0" @@ -36,8 +35,6 @@ backtrace = "0.3.40" parking_lot = "0.9" byteorder = { version = "1.3" } chalk-engine = { version = "0.9.0", default-features=false } -rustc_fs_util = { path = "../librustc_fs_util" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } -measureme = "0.5" rustc_error_codes = { path = "../librustc_error_codes" } rustc_session = { path = "../librustc_session" } diff --git a/src/librustc/ty/mod.rs b/src/librustc/ty/mod.rs index 747e6e8da99..2f51d21d24c 100644 --- a/src/librustc/ty/mod.rs +++ b/src/librustc/ty/mod.rs @@ -808,13 +808,6 @@ pub struct UpvarBorrow<'tcx> { pub type UpvarListMap = FxHashMap<DefId, FxIndexMap<hir::HirId, UpvarId>>; pub type UpvarCaptureMap<'tcx> = FxHashMap<UpvarId, UpvarCapture<'tcx>>; -#[derive(Copy, Clone, TypeFoldable)] -pub struct ClosureUpvar<'tcx> { - pub res: Res, - pub span: Span, - pub ty: Ty<'tcx>, -} - #[derive(Clone, Copy, PartialEq, Eq)] pub enum IntVarValue { IntType(ast::IntTy), diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs index d87296c03dd..5e24c843025 100644 --- a/src/librustc/ty/structural_impls.rs +++ b/src/librustc/ty/structural_impls.rs @@ -45,12 +45,6 @@ impl fmt::Debug for ty::AdtDef { } } -impl fmt::Debug for ty::ClosureUpvar<'tcx> { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "ClosureUpvar({:?},{:?})", self.res, self.ty) - } -} - impl fmt::Debug for ty::UpvarId { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let name = ty::tls::with(|tcx| tcx.hir().name(self.var_path.hir_id)); diff --git a/src/librustc_codegen_llvm/Cargo.toml b/src/librustc_codegen_llvm/Cargo.toml index 2d9232bc192..3ff5495e291 100644 --- a/src/librustc_codegen_llvm/Cargo.toml +++ b/src/librustc_codegen_llvm/Cargo.toml @@ -31,5 +31,4 @@ rustc_session = { path = "../librustc_session" } rustc_target = { path = "../librustc_target" } smallvec = { version = "1.0", features = ["union", "may_dangle"] } syntax = { path = "../libsyntax" } -rustc_expand = { path = "../librustc_expand" } rustc_span = { path = "../librustc_span" } diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml index ed742ed1ca0..5e0c853ed24 100644 --- a/src/librustc_driver/Cargo.toml +++ b/src/librustc_driver/Cargo.toml @@ -10,7 +10,6 @@ path = "lib.rs" crate-type = ["dylib"] [dependencies] -graphviz = { path = "../libgraphviz" } lazy_static = "1.0" log = "0.4" env_logger = { version = "0.7", default-features = false } @@ -30,7 +29,6 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" } rustc_error_codes = { path = "../librustc_error_codes" } rustc_interface = { path = "../librustc_interface" } rustc_serialize = { path = "../libserialize", package = "serialize" } -rustc_resolve = { path = "../librustc_resolve" } syntax = { path = "../libsyntax" } rustc_span = { path = "../librustc_span" } diff --git a/src/librustc_lint/Cargo.toml b/src/librustc_lint/Cargo.toml index 820064cb5b6..5ca8fc97ac4 100644 --- a/src/librustc_lint/Cargo.toml +++ b/src/librustc_lint/Cargo.toml @@ -19,5 +19,4 @@ rustc_span = { path = "../librustc_span" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_feature = { path = "../librustc_feature" } rustc_index = { path = "../librustc_index" } -rustc_error_codes = { path = "../librustc_error_codes" } rustc_session = { path = "../librustc_session" } diff --git a/src/librustc_typeck/check/upvar.rs b/src/librustc_typeck/check/upvar.rs index 9b4bd6d78ff..e4502bf134d 100644 --- a/src/librustc_typeck/check/upvar.rs +++ b/src/librustc_typeck/check/upvar.rs @@ -212,7 +212,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { } } - // Returns a list of `ClosureUpvar`s for each upvar. + // Returns a list of `Ty`s for each upvar. fn final_upvar_tys(&self, closure_id: hir::HirId) -> Vec<Ty<'tcx>> { // Presently an unboxed closure type cannot "escape" out of a // function, so we will only encounter ones that originated in the diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml index 2098656db98..e4f0398fb42 100644 --- a/src/libsyntax/Cargo.toml +++ b/src/libsyntax/Cargo.toml @@ -10,11 +10,9 @@ path = "lib.rs" doctest = false [dependencies] -bitflags = "1.2.1" rustc_serialize = { path = "../libserialize", package = "serialize" } log = "0.4" scoped-tls = "1.0" -lazy_static = "1.0.0" rustc_span = { path = "../librustc_span" } errors = { path = "../librustc_errors", package = "rustc_errors" } rustc_data_structures = { path = "../librustc_data_structures" } diff --git a/src/rustc/Cargo.toml b/src/rustc/Cargo.toml index 86a93d7d0cb..5e0f167bb38 100644 --- a/src/rustc/Cargo.toml +++ b/src/rustc/Cargo.toml @@ -9,7 +9,6 @@ name = "rustc_binary" path = "rustc.rs" [dependencies] -rustc_target = { path = "../librustc_target" } rustc_driver = { path = "../librustc_driver" } # Make sure rustc_codegen_ssa ends up in the sysroot, because this |