chore: simplify grind import graph (#10128)

src/Lean/Meta/Offset.lean

@@ -4,16 +4,13 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Init.Control.Option
 public import Lean.Data.LBool
-public import Lean.Meta.InferType
-public import Lean.Meta.NatInstTesters
-public import Lean.Util.SafeExponentiation
-
+public import Lean.Meta.Basic
+import Lean.Meta.NatInstTesters
+import Lean.Util.SafeExponentiation
 public section
-
 namespace Lean.Meta
 
 private abbrev withInstantiatedMVars (e : Expr) (k : Expr → OptionT MetaM α) : OptionT MetaM α := do

src/Lean/Meta/Tactic/Grind/Arith/Cutsat/DvdCnstr.lean

@@ -13,6 +13,7 @@ import Lean.Meta.Tactic.Grind.Arith.Cutsat.Util
 import Lean.Meta.Tactic.Grind.Arith.Cutsat.Proof
 import Lean.Meta.Tactic.Grind.Arith.Cutsat.Norm
 import Lean.Meta.Tactic.Grind.Arith.Cutsat.CommRing
+import Lean.Meta.NatInstTesters
 
 public section
 

src/Lean/Meta/Tactic/Grind/Arith/Cutsat/EqCnstr.lean

@@ -4,7 +4,6 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Lean.Meta.Tactic.Grind.Simp
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.Var
@@ -12,7 +11,7 @@ public import Lean.Meta.Tactic.Grind.Arith.Cutsat.DvdCnstr
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.LeCnstr
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.ToInt
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.CommRing
-
+import Lean.Meta.NatInstTesters
 public section
 
 namespace Lean.Meta.Grind.Arith.Cutsat

src/Lean/Meta/Tactic/Grind/Arith/Cutsat/Nat.lean

@@ -4,16 +4,14 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Init.Data.Int.OfNat
 public import Lean.Meta.Tactic.Grind.Simp
 public import Lean.Meta.Tactic.Simp.Arith.Nat.Basic
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.Norm
 public import Lean.Meta.Tactic.Grind.Arith.Cutsat.ToInt
-
+import Lean.Meta.NatInstTesters
 public section
-
 namespace Lean.Meta.Grind.Arith.Cutsat
 
 /-- Given `e`, returns `(NatCast.natCast e, rfl)` -/

src/Lean/Meta/Tactic/Grind/Arith/EvalNum.lean

@@ -4,11 +4,10 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Lean.Meta.Tactic.Grind.Types
 import Lean.Meta.IntInstTesters
-
+import Lean.Meta.NatInstTesters
 public section
 
 namespace Lean.Meta.Grind.Arith

src/Lean/Meta/Tactic/Grind/Canon.lean

@@ -4,7 +4,6 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Init.Grind.Util
 public import Lean.Meta.Basic
@@ -14,9 +13,8 @@ public import Lean.Util.PtrSet
 public import Lean.Util.FVarSubset
 public import Lean.Meta.Tactic.Grind.Types
 import Lean.Meta.IntInstTesters
-
+import Lean.Meta.NatInstTesters
 public section
-
 namespace Lean.Meta.Grind
 namespace Canon
 

src/Lean/Meta/Tactic/Simp/Arith/Nat/Basic.lean

@@ -4,17 +4,14 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Lean.Util.SortExprs
-public import Lean.Meta.Check
-public import Lean.Meta.Offset
-public import Lean.Meta.AppBuilder
 public import Lean.Meta.KExprMap
-public import Lean.Data.RArray
-
+import Lean.Meta.Offset
+import Lean.Data.RArray
+import Lean.Meta.AppBuilder
+import Lean.Meta.NatInstTesters
 public section
-
 namespace Nat.Linear
 
 /-- Applies the given variable permutation to `e` -/

src/Lean/Meta/Tactic/Simp/Arith/Nat/Simp.lean

@@ -4,13 +4,11 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 module
-
 prelude
 public import Lean.Meta.Tactic.Simp.Arith.Util
 public import Lean.Meta.Tactic.Simp.Arith.Nat.Basic
-
+import Lean.Meta.AppBuilder
 public section
-
 namespace Lean.Meta.Simp.Arith.Nat
 
 def simpCnstrPos? (e : Expr) : MetaM (Option (Expr × Expr)) := do