Move Limit

Author: mejrs

Cargo.lock

@@ -3664,6 +3664,7 @@ dependencies = [
  "rustc_macros",
  "rustc_serialize",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "smallvec",
  "thin-vec",
@@ -3688,6 +3689,7 @@ dependencies = [
  "rustc_parse_format",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "thin-vec",
 ]
@@ -3855,6 +3857,7 @@ dependencies = [
  "rustc_mir_dataflow",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_trait_selection",
  "tracing",
@@ -3973,6 +3976,7 @@ dependencies = [
  "rustc_macros",
  "rustc_serialize",
  "rustc_span",
+ "rustc_structures",
  "unic-langid",
 ]
 
@@ -4023,6 +4027,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "scoped-tls",
  "smallvec",
  "thin-vec",
@@ -4098,6 +4103,7 @@ dependencies = [
  "rustc_middle",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_trait_selection",
  "smallvec",
@@ -4251,6 +4257,7 @@ dependencies = [
  "rustc_resolve",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_symbol_mangling",
  "rustc_target",
  "rustc_thread_pool",
@@ -4405,6 +4412,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_thread_pool",
  "rustc_type_ir",
@@ -4476,6 +4484,7 @@ dependencies = [
  "rustc_mir_dataflow",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_trait_selection",
  "smallvec",
@@ -4498,6 +4507,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_symbol_mangling",
  "rustc_target",
  "serde",
@@ -4663,6 +4673,7 @@ dependencies = [
  "rustc_middle",
  "rustc_serialize",
  "rustc_span",
+ "rustc_structures",
  "rustc_thread_pool",
  "tracing",
 ]
@@ -4741,6 +4752,7 @@ dependencies = [
  "rustc_macros",
  "rustc_serialize",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "termize",
  "tracing",
@@ -4770,6 +4782,15 @@ dependencies = [
  "unicode-width 0.2.2",
 ]
 
+[[package]]
+name = "rustc_structures"
+version = "0.0.0"
+dependencies = [
+ "rustc_data_structures",
+ "rustc_macros",
+ "rustc_serialize",
+]
+
 [[package]]
 name = "rustc_symbol_mangling"
 version = "0.0.0"
@@ -4849,6 +4870,7 @@ dependencies = [
  "rustc_next_trait_solver",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_transmute",
  "smallvec",
  "thin-vec",
@@ -4897,6 +4919,7 @@ dependencies = [
  "rustc_middle",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_trait_selection",
  "rustc_ty_walk",

compiler/rustc_attr_ir/Cargo.toml

@@ -13,6 +13,7 @@ rustc_error_messages = { path = "../rustc_error_messages" }
 rustc_macros = { path = "../rustc_macros" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_span = { path = "../rustc_span" }
+rustc_structures = { path = "../rustc_structures" }
 rustc_target = { path = "../rustc_target" }
 smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
 thin-vec = "0.2.18"

compiler/rustc_attr_ir/src/data_structures.rs

@@ -10,13 +10,13 @@ use rustc_ast::expand::autodiff_attrs::{DiffActivity, DiffMode};
 use rustc_ast::expand::typetree::TypeTree;
 use rustc_ast::token::DocFragmentKind;
 use rustc_ast::{AttrStyle, Path, ast};
-use rustc_data_structures::Limit;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_error_messages::{DiagArgValue, IntoDiagArg};
 use rustc_macros::{Decodable, Encodable, PrintAttribute, StableHash};
 use rustc_span::def_id::DefId;
 use rustc_span::hygiene::Transparency;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
+use rustc_structures::Limit;
 pub use rustc_target::spec::SanitizerSet;
 use thin_vec::ThinVec;
 

compiler/rustc_attr_ir/src/pretty_printing.rs

@@ -10,11 +10,11 @@ use rustc_ast::expand::autodiff_attrs::{DiffActivity, DiffMode};
 use rustc_ast::token::{CommentKind, DocFragmentKind};
 use rustc_ast::{AttrId, AttrStyle, IntTy, UintTy};
 use rustc_ast_pretty::pp::Printer;
-use rustc_data_structures::Limit;
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_span::def_id::DefId;
 use rustc_span::hygiene::Transparency;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
+use rustc_structures::Limit;
 use rustc_target::spec::SanitizerSet;
 use thin_vec::ThinVec;
 

compiler/rustc_attr_parsing/Cargo.toml

@@ -19,6 +19,7 @@ rustc_parse = { path = "../rustc_parse" }
 rustc_parse_format = { path = "../rustc_parse_format" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
+rustc_structures = { path = "../rustc_structures" }
 rustc_target = { path = "../rustc_target" }
 thin-vec = "0.2.19"
 # tidy-alphabetical-end

compiler/rustc_attr_parsing/src/attributes/util.rs

@@ -2,9 +2,9 @@ use std::num::IntErrorKind;
 
 use rustc_ast::{LitKind, ast};
 use rustc_attr_ir::RustcVersion;
-use rustc_data_structures::Limit;
 use rustc_feature::is_builtin_attr_name;
 use rustc_span::Symbol;
+use rustc_structures::Limit;
 
 use crate::context::AcceptContext;
 use crate::diagnostics::LimitInvalid;

compiler/rustc_const_eval/Cargo.toml

@@ -20,6 +20,7 @@ rustc_middle = { path = "../rustc_middle" }
 rustc_mir_dataflow = { path = "../rustc_mir_dataflow" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
+rustc_structures = { path = "../rustc_structures" }
 rustc_target = { path = "../rustc_target" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }
 tracing = "0.1"

compiler/rustc_const_eval/src/interpret/eval_context.rs

@@ -3,7 +3,6 @@ use std::collections::hash_map::Entry;
 
 use either::{Left, Right};
 use rustc_abi::{Align, HasDataLayout, Size, TargetDataLayout};
-use rustc_data_structures::Limit;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_hir::def_id::DefId;
 use rustc_middle::mir::interpret::{ErrorHandled, InvalidMetaKind, ReportedErrorInfo};
@@ -17,6 +16,7 @@ use rustc_middle::ty::{
 };
 use rustc_middle::{mir, span_bug};
 use rustc_span::Span;
+use rustc_structures::Limit;
 use rustc_target::callconv::FnAbi;
 use tracing::{debug, trace};
 

compiler/rustc_data_structures/src/lib.rs

@@ -48,7 +48,6 @@ pub use ena::{snapshot_vec, undo_log, unify};
 // (via `ShardedHashMap`), and because it lets other compiler crates use the
 // lower-level `HashTable` API without a tricky `hashbrown` dependency.
 pub use hashbrown::hash_table;
-pub use limit::Limit;
 pub use rustc_index::static_assert_size;
 // Re-export some data-structure crates which are part of our public API.
 pub use {either, indexmap, smallvec, thin_vec};
@@ -63,7 +62,6 @@ pub mod fx;
 pub mod graph;
 pub mod intern;
 pub mod jobserver;
-mod limit;
 pub mod marker;
 pub mod memmap;
 pub mod obligation_forest;

compiler/rustc_error_messages/Cargo.toml

@@ -14,5 +14,6 @@ rustc_data_structures = { path = "../rustc_data_structures" }
 rustc_macros = { path = "../rustc_macros" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_span = { path = "../rustc_span" }
+rustc_structures = { path = "../rustc_structures" }
 unic-langid = { version = "0.9.0", features = ["macros"] }
 # tidy-alphabetical-end