Skip to content

Commit

Permalink
Merge pull request #23 from leanprover-community/nightly-testing
Browse files Browse the repository at this point in the history
chore: move to v4.11.0-rc1
  • Loading branch information
kim-em authored Aug 5, 2024
2 parents e7e90d9 + 982eb1c commit 68cd8ae
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
1 change: 0 additions & 1 deletion ImportGraph/Cli.lean
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Authors: Kim Morrison
-/
import Cli.Basic
import Batteries.Lean.IO.Process
import Batteries.Lean.Util.Path
import ImportGraph.CurrentModule
import ImportGraph.Imports
import ImportGraph.Lean.Name
Expand Down
11 changes: 5 additions & 6 deletions ImportGraph/Lean/Name.lean
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ Authors: Jon Eugster
-/
import Lean.Data.Name
import Lean.CoreM
import Batteries.Data.HashMap.Basic
import Batteries.Lean.SMap
import Lean.Meta.Match.MatcherInfo
import Std.Data.HashMap

/-!
TODO: Some declarations in this file are duplicated from mathlib, but especially `isBlacklisted`
Expand Down Expand Up @@ -46,12 +45,12 @@ gathered together into a `HashMap` according to the module they are defined in.
Note: copied from `Mathlib.Lean.Name`
-/
def allNamesByModule (p : Name → Bool) : CoreM (Batteries.HashMap Name (Array Name)) := do
(← getEnv).constants.foldM (init := Batteries.HashMap.empty) fun names n _ => do
def allNamesByModule (p : Name → Bool) : CoreM (Std.HashMap Name (Array Name)) := do
(← getEnv).constants.foldM (init := Std.HashMap.empty) fun names n _ => do
if p n && !(← isBlackListed n) then
let some m ← findModuleOf? n | return names
-- TODO use `Batteries.HashMap.modify` when we bump `batteries` (or `alter` if that is written).
match names.find? m with
-- TODO use `modify`/`alter` when available
match names[m]? with
| some others => return names.insert m (others.push n)
| none => return names.insert m #[n]
else
Expand Down
2 changes: 1 addition & 1 deletion lake-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"type": "git",
"subDir": null,
"scope": "",
"rev": "0f3e143dffdc3a591662f3401ce1d7a3405227c0",
"rev": "021e272cb5cdcc82b7e1e760fe915ff2f64169ad",
"name": "batteries",
"manifestFile": "lake-manifest.json",
"inputRev": "main",
Expand Down
2 changes: 1 addition & 1 deletion lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:v4.10.0
leanprover/lean4:v4.11.0-rc1

0 comments on commit 68cd8ae

Please sign in to comment.