Move code around int

Summary: - split `mod int` - move `inline_int` and `int_or_big` into `int` Reviewed By: JakobDegen Differential Revision: D63008442 fbshipit-source-id: 68957584bab5724dbbfb73dd29774a7f7b956aad
facebook · Sep 19, 2024 · 3235a63 · 3235a63
1 parent afa9a3f
commit 3235a63
Show file tree

Hide file tree

Showing 23 changed files with 471 additions and 407 deletions.
diff --git a/starlark-rust/starlark/src/analysis/dubious.rs b/starlark-rust/starlark/src/analysis/dubious.rs
@@ -33,7 +33,7 @@ use crate::codemap::FileSpan;
 use crate::codemap::Span;
 use crate::syntax::AstModule;
 use crate::values::num::value::NumRef;
-use crate::values::types::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkInt;
 
 #[derive(Error, Debug)]
 pub(crate) enum Dubious {

diff --git a/starlark-rust/starlark/src/eval/bc/instr_impl.rs b/starlark-rust/starlark/src/eval/bc/instr_impl.rs
@@ -71,7 +71,7 @@ use crate::eval::DefInfo;
 use crate::eval::Evaluator;
 use crate::eval::ParametersSpec;
 use crate::values::dict::Dict;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::layout::value_not_special::FrozenValueNotSpecial;
 use crate::values::string::dot_format::format_one;
 use crate::values::string::interpolation::percent_s_one;

diff --git a/starlark-rust/starlark/src/eval/compiler/expr.rs b/starlark-rust/starlark/src/eval/compiler/expr.rs
@@ -70,8 +70,8 @@ use crate::values::string::interpolation::parse_percent_s_one;
 use crate::values::types::dict::Dict;
 use crate::values::types::ellipsis::Ellipsis;
 use crate::values::types::float::StarlarkFloat;
-use crate::values::types::inline_int::InlineInt;
-use crate::values::types::int_or_big::StarlarkInt;
+use crate::values::types::int::inline_int::InlineInt;
+use crate::values::types::int::int_or_big::StarlarkInt;
 use crate::values::types::list::value::FrozenListData;
 use crate::values::types::list::value::ListData;
 use crate::values::types::string::dot_format::format_one;

diff --git a/starlark-rust/starlark/src/stdlib/funcs/other.rs b/starlark-rust/starlark/src/stdlib/funcs/other.rs
@@ -26,12 +26,12 @@ use starlark_derive::starlark_module;
 use crate as starlark;
 use crate::environment::GlobalsBuilder;
 use crate::eval::Evaluator;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::list::AllocList;
 use crate::values::num::value::Num;
 use crate::values::num::value::NumRef;
 use crate::values::tuple::UnpackTuple;
-use crate::values::types::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkInt;
 use crate::values::typing::never::StarlarkNever;
 use crate::values::typing::ty::AbstractType;
 use crate::values::typing::StarlarkIter;

diff --git a/starlark-rust/starlark/src/stdlib/json.rs b/starlark-rust/starlark/src/stdlib/json.rs
@@ -30,7 +30,7 @@ use crate::environment::GlobalsBuilder;
 use crate::typing::Ty;
 use crate::values::dict::AllocDict;
 use crate::values::type_repr::StarlarkTypeRepr;
-use crate::values::types::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkInt;
 use crate::values::AllocFrozenValue;
 use crate::values::AllocValue;
 use crate::values::FrozenHeap;

diff --git a/starlark-rust/starlark/src/values/index.rs b/starlark-rust/starlark/src/values/index.rs
@@ -148,7 +148,7 @@ pub(crate) fn apply_slice<T: Copy>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::values::types::inline_int::InlineInt;
+    use crate::values::types::int::inline_int::InlineInt;
     use crate::values::Heap;
 
     #[test]

diff --git a/starlark-rust/starlark/src/values/layout/pointer.rs b/starlark-rust/starlark/src/values/layout/pointer.rs
@@ -36,10 +36,10 @@ use either::Either;
 use static_assertions::assert_eq_size;
 
 use crate::cast;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::layout::heap::repr::AValueHeader;
 use crate::values::layout::heap::repr::AValueOrForward;
-use crate::values::types::inline_int::InlineInt;
+use crate::values::types::int::inline_int::InlineInt;
 
 /// Tagged pointer logically equivalent to `*mut AValueHeader`.
 #[derive(Clone, Copy, Dupe, PartialEq, Eq, Hash, Allocative)]

diff --git a/starlark-rust/starlark/src/values/layout/typed.rs b/starlark-rust/starlark/src/values/layout/typed.rs
@@ -42,7 +42,7 @@ use crate::coerce::CoerceKey;
 use crate::typing::Ty;
 use crate::values::alloc_value::AllocFrozenStringValue;
 use crate::values::alloc_value::AllocStringValue;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::layout::avalue::AValue;
 use crate::values::layout::avalue::AValueImpl;
 use crate::values::layout::heap::repr::AValueRepr;
@@ -452,7 +452,7 @@ mod tests {
     use crate::assert::Assert;
     use crate::environment::GlobalsBuilder;
     use crate::tests::util::TestComplexValue;
-    use crate::values::int::PointerI32;
+    use crate::values::int::pointer_i32::PointerI32;
     use crate::values::none::NoneType;
     use crate::values::FrozenValue;
     use crate::values::FrozenValueTyped;

diff --git a/starlark-rust/starlark/src/values/layout/value.rs b/starlark-rust/starlark/src/values/layout/value.rs
@@ -74,7 +74,7 @@ use crate::values::enumeration::FrozenEnumValue;
 use crate::values::function::FrozenBoundMethod;
 use crate::values::function::NativeFunction;
 use crate::values::function::FUNCTION_TYPE;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::iter::StarlarkIterator;
 use crate::values::layout::avalue::AValue;
 use crate::values::layout::avalue::AValueImpl;
@@ -104,8 +104,8 @@ use crate::values::string::str_type::StarlarkStr;
 use crate::values::structs::value::FrozenStruct;
 use crate::values::tuple::value::VALUE_EMPTY_TUPLE;
 use crate::values::type_repr::StarlarkTypeRepr;
-use crate::values::types::inline_int::InlineInt;
-use crate::values::types::int_or_big::StarlarkIntRef;
+use crate::values::types::int::inline_int::InlineInt;
+use crate::values::types::int::int_or_big::StarlarkIntRef;
 use crate::values::types::list::value::FrozenListData;
 use crate::values::types::tuple::value::FrozenTuple;
 use crate::values::types::tuple::value::Tuple;
@@ -1395,10 +1395,10 @@ mod tests {
     use num_bigint::BigInt;
 
     use crate::assert;
+    use crate::values::int::pointer_i32::PointerI32;
     use crate::values::list::AllocList;
     use crate::values::none::NoneType;
     use crate::values::string::str_type::StarlarkStr;
-    use crate::values::types::int::PointerI32;
     use crate::values::unpack::UnpackValue;
     use crate::values::Heap;
     use crate::values::Value;

diff --git a/starlark-rust/starlark/src/values/layout/vtable.rs b/starlark-rust/starlark/src/values/layout/vtable.rs
@@ -40,7 +40,7 @@ use crate::eval::Evaluator;
 use crate::private::Private;
 use crate::typing::Ty;
 use crate::values::demand::Demand;
-use crate::values::int::PointerI32;
+use crate::values::int::pointer_i32::PointerI32;
 use crate::values::layout::avalue::AValue;
 use crate::values::layout::avalue::BlackHole;
 use crate::values::layout::const_type_id::ConstTypeId;

diff --git a/starlark-rust/starlark/src/values/num/value.rs b/starlark-rust/starlark/src/values/num/value.rs
@@ -26,8 +26,8 @@ use crate as starlark;
 use crate::collections::StarlarkHashValue;
 use crate::values::type_repr::StarlarkTypeRepr;
 use crate::values::types::float::StarlarkFloat;
-use crate::values::types::int_or_big::StarlarkInt;
-use crate::values::types::int_or_big::StarlarkIntRef;
+use crate::values::types::int::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkIntRef;
 use crate::values::AllocFrozenValue;
 use crate::values::AllocValue;
 use crate::values::UnpackValue;
@@ -230,7 +230,7 @@ mod tests {
     use num_bigint::BigInt;
 
     use super::*;
-    use crate::values::types::inline_int::InlineInt;
+    use crate::values::types::int::inline_int::InlineInt;
     use crate::values::Value;
 
     #[test]

diff --git a/starlark-rust/starlark/src/values/types.rs b/starlark-rust/starlark/src/values/types.rs
@@ -27,9 +27,7 @@ pub mod enumeration;
 pub mod exported_name;
 pub mod float;
 pub mod function;
-pub(crate) mod inline_int;
 pub mod int;
-pub(crate) mod int_or_big;
 pub(crate) mod known_methods;
 pub mod list;
 pub mod list_or_tuple;

diff --git a/starlark-rust/starlark/src/values/types/bigint.rs b/starlark-rust/starlark/src/values/types/bigint.rs
@@ -38,9 +38,9 @@ use crate::typing::TypingBinOp;
 use crate::values::num::typecheck::typecheck_num_bin_op;
 use crate::values::num::typecheck::NumTy;
 use crate::values::num::value::NumRef;
-use crate::values::types::inline_int::InlineInt;
-use crate::values::types::int_or_big::StarlarkInt;
-use crate::values::types::int_or_big::StarlarkIntRef;
+use crate::values::types::int::inline_int::InlineInt;
+use crate::values::types::int::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkIntRef;
 use crate::values::AllocFrozenValue;
 use crate::values::AllocValue;
 use crate::values::FrozenHeap;

diff --git a/starlark-rust/starlark/src/values/types/bigint/convert.rs b/starlark-rust/starlark/src/values/types/bigint/convert.rs
@@ -19,8 +19,8 @@ use num_bigint::BigInt;
 
 use crate::typing::Ty;
 use crate::values::type_repr::StarlarkTypeRepr;
-use crate::values::types::int_or_big::StarlarkInt;
-use crate::values::types::int_or_big::StarlarkIntRef;
+use crate::values::types::int::int_or_big::StarlarkInt;
+use crate::values::types::int::int_or_big::StarlarkIntRef;
 use crate::values::AllocFrozenValue;
 use crate::values::AllocValue;
 use crate::values::FrozenHeap;