chore: move Bootstrap.Data -> Lean.Data

src/Bootstrap.lean

@@ -3,5 +3,4 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data
 import Bootstrap.Dynamic

src/Bootstrap/Data.lean

@@ -1,13 +0,0 @@
-/-
-Copyright (c) 2020 Microsoft Corporation. All rights reserved.
-Released under Apache 2.0 license as described in the file LICENSE.
-Authors: Leonardo de Moura
--/
-import Bootstrap.Data.HashMap
-import Bootstrap.Data.HashSet
-import Bootstrap.Data.PersistentArray
-import Bootstrap.Data.PersistentHashMap
-import Bootstrap.Data.PersistentHashSet
-import Bootstrap.Data.AssocList
-import Bootstrap.Data.RBTree
-import Bootstrap.Data.RBMap

src/Lean/Data.lean

@@ -3,10 +3,11 @@ Copyright (c) 2020 Sebastian Ullrich. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Sebastian Ullrich
 -/
+import Lean.Data.AssocList
 import Lean.Data.Format
-import Lean.Data.Parsec
+import Lean.Data.HashMap
+import Lean.Data.HashSet
 import Lean.Data.Json
-import Lean.Data.Xml
 import Lean.Data.JsonRpc
 import Lean.Data.KVMap
 import Lean.Data.LBool
@@ -16,9 +17,16 @@ import Lean.Data.Name
 import Lean.Data.Occurrences
 import Lean.Data.OpenDecl
 import Lean.Data.Options
+import Lean.Data.Parsec
+import Lean.Data.PersistentArray
+import Lean.Data.PersistentHashMap
+import Lean.Data.PersistentHashSet
 import Lean.Data.Position
+import Lean.Data.PrefixTree
 import Lean.Data.SMap
 import Lean.Data.Trie
-import Lean.Data.PrefixTree
+import Lean.Data.Xml
 import Lean.Data.NameTrie
+import Lean.Data.RBTree
+import Lean.Data.RBMap
 import Lean.Data.Rat

src/Lean/Data/HashMap.lean

@@ -3,7 +3,7 @@ Copyright (c) 2018 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 -/
-import Bootstrap.Data.AssocList
+import Lean.Data.AssocList
 namespace Std
 universe u v w
 

src/Lean/Data/Json/Basic.lean

@@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 
 Authors: Gabriel Ebner, Marc Huisinga
 -/
-import Bootstrap.Data.RBTree
+import Lean.Data.RBTree
 namespace Lean
 
 -- mantissa * 10^-exponent

src/Lean/Data/JsonRpc.lean

@@ -6,7 +6,7 @@ Authors: Marc Huisinga, Wojciech Nawrocki
 -/
 import Init.Control
 import Init.System.IO
-import Bootstrap.Data.RBTree
+import Lean.Data.RBTree
 import Lean.Data.Json
 
 /-! Implementation of JSON-RPC 2.0 (https://www.jsonrpc.org/specification)

src/Lean/Data/Name.lean

@@ -3,9 +3,9 @@ Copyright (c) 2018 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 -/
-import Bootstrap.Data.HashSet
-import Bootstrap.Data.RBMap
-import Bootstrap.Data.RBTree
+import Lean.Data.HashSet
+import Lean.Data.RBMap
+import Lean.Data.RBTree
 import Lean.Data.SSet
 namespace Lean
 

src/Lean/Data/PersistentHashSet.lean

@@ -3,7 +3,7 @@ Copyright (c) 2019 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 -/
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.PersistentHashMap
 
 namespace Std
 universe u v

src/Lean/Data/PrefixTree.lean

@@ -3,7 +3,7 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 
 namespace Lean
 open Std

src/Lean/Data/RBTree.lean

@@ -3,7 +3,7 @@ Copyright (c) 2017 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 namespace Std
 universe u v w
 

src/Lean/Data/SMap.lean

@@ -3,8 +3,8 @@ Copyright (c) 2019 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashMap
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.HashMap
+import Lean.Data.PersistentHashMap
 universe u v w w'
 
 namespace Lean

src/Lean/Data/Xml/Basic.lean

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Dany Fabian
 -/
 
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 namespace Lean
 namespace Xml
 

src/Lean/Environment.lean

@@ -3,7 +3,7 @@ Copyright (c) 2019 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashMap
+import Lean.Data.HashMap
 import Lean.ImportingFlag
 import Lean.Data.SMap
 import Lean.Declaration

src/Lean/Level.lean

@@ -3,10 +3,10 @@ Copyright (c) 2018 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashMap
-import Bootstrap.Data.HashSet
-import Bootstrap.Data.PersistentHashMap
-import Bootstrap.Data.PersistentHashSet
+import Lean.Data.HashMap
+import Lean.Data.HashSet
+import Lean.Data.PersistentHashMap
+import Lean.Data.PersistentHashSet
 import Lean.Hygiene
 import Lean.Data.Name
 import Lean.Data.Format

src/Lean/Linter/UnusedVariables.lean

@@ -3,7 +3,7 @@ import Lean.Linter.Util
 import Lean.Elab.InfoTree
 import Lean.Server.InfoUtils
 import Lean.Server.References
-import Bootstrap.Data.HashMap
+import Lean.Data.HashMap
 
 namespace Lean.Linter
 open Lean.Elab.Command Lean.Server Std

src/Lean/LocalContext.lean

@@ -3,7 +3,7 @@ Copyright (c) 2019 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.PersistentArray
+import Lean.Data.PersistentArray
 import Lean.Expr
 import Lean.Hygiene
 

src/Lean/Meta/Tactic/FVarSubst.lean

@@ -3,7 +3,7 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.AssocList
+import Lean.Data.AssocList
 import Lean.Expr
 import Lean.LocalContext
 import Lean.Util.ReplaceExpr

src/Lean/PrettyPrinter/Delaborator/SubExpr.lean

@@ -5,7 +5,7 @@ Authors: Sebastian Ullrich, Daniel Selsam, Wojciech Nawrocki
 -/
 import Lean.Meta.Basic
 import Lean.SubExpr
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 
 /-!
 # Subexpr utilities for delaborator.

src/Lean/PrettyPrinter/Delaborator/TopDownAnalyze.lean

@@ -3,7 +3,7 @@ Copyright (c) 2021 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Daniel Selsam
 -/
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 import Lean.Meta.SynthInstance
 import Lean.Util.FindMVar
 import Lean.Util.FindLevelMVar

src/Lean/Server/FileWorker.lean

@@ -5,7 +5,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Marc Huisinga, Wojciech Nawrocki
 -/
 import Init.System.IO
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 
 import Lean.Environment
 

src/Lean/Server/Watchdog.lean

@@ -6,7 +6,7 @@ Authors: Marc Huisinga, Wojciech Nawrocki
 -/
 import Init.System.IO
 import Init.Data.ByteArray
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 
 import Lean.Elab.Import
 import Lean.Util.Paths

src/Lean/SubExpr.lean

@@ -5,7 +5,7 @@ Authors: Sebastian Ullrich, Daniel Selsam, Wojciech Nawrocki, E.W.Ayers
 -/
 import Lean.Meta.Basic
 import Lean.Data.Json
-import Bootstrap.Data.RBMap
+import Lean.Data.RBMap
 
 namespace Lean
 

src/Lean/Util/MonadCache.lean

@@ -3,7 +3,7 @@ Copyright (c) 2019 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashMap
+import Lean.Data.HashMap
 
 namespace Lean
 /-- Interface for caching results.  -/

src/Lean/Util/SCC.lean

@@ -3,7 +3,7 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashMap
+import Lean.Data.HashMap
 namespace Lean.SCC
 /-!
   Very simple implementation of Tarjan's SCC algorithm.

src/Lean/Util/ShareCommon.lean

@@ -3,10 +3,10 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Bootstrap.Data.HashSet
-import Bootstrap.Data.HashMap
-import Bootstrap.Data.PersistentHashMap
-import Bootstrap.Data.PersistentHashSet
+import Lean.Data.HashSet
+import Lean.Data.HashMap
+import Lean.Data.PersistentHashMap
+import Lean.Data.PersistentHashSet
 
 open ShareCommon
 namespace Lean.ShareCommon

src/lake

@@ -1 +1 @@
-Subproject commit b71e2f3a6c4d59b6ada8e22e297626e701dfd875
+Subproject commit 6b0abded611a1b4315084d98628e2dda41d40283

tests/bench/liasolver.lean

@@ -4,7 +4,7 @@ Linear Diophantine equation solver
 Author: Marc Huisinga
 -/
 
-import Bootstrap.Data.HashMap
+import Lean.Data.HashMap
 
 open Std
 

tests/compiler/phashmap.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.PersistentHashMap
 import Lean.Data.Format
 
 open Lean Std Std.PersistentHashMap

tests/compiler/phashmap2.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.PersistentHashMap
 import Lean.Data.Format
 open Lean Std Std.PersistentHashMap
 

tests/compiler/phashmap3.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.PersistentHashMap
 import Lean.Data.Format
 open Lean Std Std.PersistentHashMap
 

tests/compiler/rbmap_library.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.RBMap
 open Std
 
 def check (b : Bool) : IO Unit := do

tests/lean/1206.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.HashSet
 
 set_option linter.unusedVariables true
 

tests/lean/funInfoBug.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.AssocList
+import Lean.Data.AssocList
 
 def l : List (Prod Nat Nat) := [(1, 1), (2, 2)]
 #eval l -- works

tests/lean/moduleOf.lean.expected.out

@@ -1,7 +1,7 @@
 (some Init.Prelude)
 (some Lean.CoreM)
 (some Lean.Elab.Term)
-(some Bootstrap.Data.HashMap)
+(some Lean.Data.HashMap)
 none
 none
 moduleOf.lean:16:0-16:9: error: unknown constant 'foo'

tests/lean/phashmap_inst_coherence.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.PersistentHashMap
+import Lean.Data.PersistentHashMap
 
 open Std
 def m : PersistentHashMap Nat Nat :=

tests/lean/run/arthur1.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.HashMap
 
 inductive NEList (α : Type)
   | uno  : α → NEList α

tests/lean/run/arthur2.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.HashMap
 
 inductive NEList (α : Type)
   | uno  : α → NEList α

tests/lean/run/forInPArray.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.PersistentArray
 
 def check (x : IO Nat) (expected : IO Nat) : IO Unit := do
 unless (← x) == (← expected) do

tests/lean/run/parray1.lean

@@ -1,4 +1,4 @@
-import Bootstrap.Data.PersistentArray
+import Lean.Data.PersistentArray
 
 def check [BEq α] (as : List α) : Bool :=
   as.toPersistentArray.foldr (.::.) [] == as

tests/lean/run/sizeof6.lean

@@ -1,4 +1,4 @@
-import Bootstrap
+import Lean.Data.PersistentArray
 
 inductive Foo where
   | mk (args : Std.PersistentArray Foo)