Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: adaptations for leanprover/lean4#3123 #502

Merged
merged 3 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Std/Lean/Meta/DiscrTree.lean
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ Inserts a new key into a discrimination tree,
but only if it is not of the form `#[*]` or `#[=, *, *, *]`.
-/
def insertIfSpecific [BEq α] (d : DiscrTree α)
(keys : Array DiscrTree.Key) (v : α) (config : WhnfCoreConfig) : DiscrTree α :=
(keys : Array DiscrTree.Key) (v : α) : DiscrTree α :=
if keys == #[Key.star] || keys == #[Key.const `Eq 3, Key.star, Key.star, Key.star] then
d
else
d.insertCore keys v config
d.insertCore keys v

variable {m : Type → Type} [Monad m]

Expand Down
2 changes: 1 addition & 1 deletion Std/Tactic/Ext/Attr.lean
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ initialize extExtension :
SimpleScopedEnvExtension ExtTheorem ExtTheorems ←
registerSimpleScopedEnvExtension {
addEntry := fun { tree, erased } thm =>
{ tree := tree.insertCore thm.keys thm extExt.config, erased := erased.erase thm.declName }
{ tree := tree.insertCore thm.keys thm, erased := erased.erase thm.declName }
initial := {}
}

Expand Down
2 changes: 1 addition & 1 deletion Std/Tactic/Relation/Rfl.lean
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def reflExt.config : WhnfCoreConfig := {}
initialize reflExt :
SimpleScopedEnvExtension (Name × Array DiscrTree.Key) (DiscrTree Name) ←
registerSimpleScopedEnvExtension {
addEntry := fun dt (n, ks) => dt.insertCore ks n reflExt.config
addEntry := fun dt (n, ks) => dt.insertCore ks n
initial := {}
}

Expand Down
2 changes: 1 addition & 1 deletion Std/Tactic/Relation/Symm.lean
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def symmExt.config : WhnfCoreConfig := {}
initialize symmExt :
SimpleScopedEnvExtension (Name × Array DiscrTree.Key) (DiscrTree Name) ←
registerSimpleScopedEnvExtension {
addEntry := fun dt (n, ks) => dt.insertCore ks n symmExt.config
addEntry := fun dt (n, ks) => dt.insertCore ks n
initial := {}
}

Expand Down
2 changes: 1 addition & 1 deletion Std/Util/Cache.lean
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def DiscrTreeCache.mk [BEq α] (profilingName : String)
IO (DiscrTreeCache α) :=
let updateTree := fun name constInfo tree => do
return (← processDecl name constInfo).foldl (init := tree) fun t (k, v) =>
t.insertCore k v config
t.insertCore k v
let addDecl := fun name constInfo (tree₁, tree₂) =>
return (← updateTree name constInfo tree₁, tree₂)
let addLibraryDecl := fun name constInfo (tree₁, tree₂) =>
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.5.0-rc1
leanprover/lean4:nightly-2024-01-03
Loading