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: bump toolchain to v4.16.0-rc1 #188

Merged
merged 66 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9629ef1
bump batteries
kim-em Aug 8, 2024
d9caf68
bump batteries
kim-em Aug 8, 2024
e73cfab
fixes
kim-em Aug 8, 2024
86ebac8
hashset adaptations
kim-em Aug 8, 2024
498b12d
bump batteries
kim-em Aug 8, 2024
a8ffe24
chore: adaptations for nightly-2024-08-08 (#151)
kim-em Aug 8, 2024
1de41af
use ofArray
kim-em Aug 8, 2024
4c36034
bump batteries
kim-em Aug 9, 2024
0af0657
toolchain
kim-em Aug 9, 2024
6e275d9
fixes
kim-em Aug 9, 2024
7662d94
fix
kim-em Aug 9, 2024
ed1c351
bump batteries
kim-em Aug 12, 2024
564957b
Merge branch 'master' into nightly-testing
JLimperg Aug 27, 2024
5213a3e
RulePattern test: fix
JLimperg Aug 27, 2024
f6b6e34
bump toolchain
kim-em Aug 28, 2024
01acd0e
merge master
kim-em Aug 28, 2024
5a6fc11
merge nightly-testing
kim-em Aug 28, 2024
1039b42
fix test
kim-em Aug 28, 2024
b250124
Merge branch 'master' into nightly-testing
JLimperg Aug 29, 2024
5439abf
chore: adaptations for nightly-2024-08-27 (#156)
kim-em Aug 30, 2024
4de4f02
Merge branch 'master' into nightly-testing
JLimperg Aug 31, 2024
8c71c6e
merge master
kim-em Sep 3, 2024
6ad7f15
fix merge
kim-em Sep 3, 2024
a79ee83
.
kim-em Sep 3, 2024
53ea84a
bump
kim-em Oct 2, 2024
db6686f
.
kim-em Oct 2, 2024
f6649fd
merge origin/master
kim-em Oct 2, 2024
7c53fc5
Fix List test
JLimperg Oct 2, 2024
a824323
Fix SaturatePerformance test
JLimperg Oct 2, 2024
59d0f2d
Fix SeqCalcProver test
JLimperg Oct 2, 2024
ad6bed1
bump to nightly-2024-10-03
kim-em Oct 3, 2024
b1d9b33
v4.13.0-rc1
kim-em Oct 3, 2024
88169a8
Merge remote-tracking branch 'origin/master' into nightly-testing
kim-em Oct 16, 2024
5736e15
fixes for leanprover/lean4#5731
kim-em Oct 16, 2024
6503af8
rm open private
kim-em Oct 16, 2024
1ed28e5
bump toolchain and batteries
kim-em Oct 17, 2024
068d4e4
merge lean-pr-testing-5731
kim-em Oct 17, 2024
e39c290
fix tests
JLimperg Oct 18, 2024
7942d63
Merge remote-tracking branch 'origin/master' into nightly-testing
kim-em Oct 28, 2024
a4ab82d
fixes
kmill Oct 31, 2024
a3191d6
bump and fixes
kim-em Nov 1, 2024
10001e9
merge lean-pr-testing-5898
kim-em Nov 1, 2024
fa36772
fixes for leanprover/lean4#5988
kim-em Nov 11, 2024
952ee1b
bump toolchain and batteries
kim-em Nov 12, 2024
45124c5
fix
kim-em Nov 12, 2024
6d7410d
merge lean-pr-testing-5988
kim-em Nov 12, 2024
4092e80
fixes
kim-em Nov 12, 2024
0fa8cd2
fixes for leanprover/lean4#6054
kim-em Nov 13, 2024
15243bf
merge origin/main
kim-em Nov 13, 2024
1aab79c
Merge branch 'lean-pr-testing-6054' into nightly-testing
kim-em Nov 13, 2024
2b4fc3a
merge lean-pr-testing-6054
kim-em Nov 13, 2024
b4cfdc7
merge main
kim-em Nov 14, 2024
75fd9b7
fix batteries dependency
kim-em Nov 14, 2024
70fef96
bump deps
kim-em Nov 14, 2024
160c121
set toolchain and batteries
kim-em Nov 17, 2024
24d0b61
fixes for leanprover/lean4#6053
kim-em Nov 17, 2024
2c2069c
bump toolchain
kim-em Nov 20, 2024
0c995c6
fix
kim-em Nov 20, 2024
6dd5eb5
merge lean-pr-testing-6123
kim-em Dec 14, 2024
2f30a66
bump toolchain
kim-em Dec 19, 2024
1ef65c3
chore: remove unnecessary explicit indexing proofs (#185)
kim-em Dec 19, 2024
c09b5d0
merge master
kim-em Dec 20, 2024
fbb4fa1
chore: bump toolchain to v4.16.0-rc1
kim-em Jan 4, 2025
1a1a504
lake update
kim-em Jan 4, 2025
42e5c0e
merge nightly-testing
kim-em Jan 4, 2025
6b6ea49
cleanup
kim-em Jan 4, 2025
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 Aesop/RuleSet.lean
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ def LocalRuleSet.erase (rs : LocalRuleSet) (f : RuleFilter) :
if let some decl := f.matchesSimpTheorem? then
for h : i in [:rs.simpTheoremsArray.size] do
have i_valid : i < simpTheoremsArray'.fst.size := by
simp_all [Membership.mem, simpTheoremsArray'.snd]
simp_all +zetaDelta [Membership.mem, simpTheoremsArray'.snd]
let (name, simpTheorems) := simpTheoremsArray'.fst[i]
if SimpTheorems.containsDecl simpTheorems decl then
let origin := .decl decl (inv := false)
Expand All @@ -383,7 +383,7 @@ def LocalRuleSet.erase (rs : LocalRuleSet) (f : RuleFilter) :
anyErased := true
let simpTheoremsArray := simpTheoremsArray'.fst
let simpTheoremsArrayNonempty : 0 < simpTheoremsArray.size := by
simp [simpTheoremsArray'.snd, rs.simpTheoremsArrayNonempty]
simp [simpTheoremsArray, simpTheoremsArray'.snd, rs.simpTheoremsArrayNonempty]
let rs := { rs with
localNormSimpRules, simpTheoremsArray, simpTheoremsArrayNonempty
}
Expand Down
1 change: 1 addition & 0 deletions Aesop/Util/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ open DiscrTree

-- For `type = ∀ (x₁, ..., xₙ), T`, returns keys that match `T * ... *` (with
-- `n` stars).

def getConclusionDiscrTreeKeys (type : Expr) : MetaM (Array Key) :=
withoutModifyingState do
let (_, _, conclusion) ← forallMetaTelescope type
Expand Down
2 changes: 1 addition & 1 deletion AesopTest/List.lean
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ theorem last_append (l₁ l₂ : List α) (h : l₂ ≠ []) :
last (l₁ ++ l₂) (append_ne_nil_of_right_ne_nil l₁ h) = last l₂ h := by
induction l₁ <;> aesop

theorem last_concat {a : α} (l : List α) : last (concat l a) (concat_ne_nil a l) = a := by
theorem last_concat {a : α} (l : List α) : last (concat l a) (X.concat_ne_nil a l) = a := by
aesop

@[simp] theorem last_singleton (a : α) : last [a] (cons_ne_nil a []) = a := rfl
Expand Down
2 changes: 1 addition & 1 deletion AesopTest/RulePattern.lean
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ example (m n : Nat) : (↑m : Int) < 0 ∧ (↑n : Int) > 0 := by
set_option aesop.check.script false in
aesop!
all_goals
guard_hyp fwd_1 : 0 ≤ (m : Int)
guard_hyp fwd_2 : 0 ≤ (n : Int)
guard_hyp fwd_1 : 0 ≤ (m : Int)
falso

@[aesop safe forward (pattern := min x y)]
Expand Down
10 changes: 5 additions & 5 deletions AesopTest/SaturatePerformance.lean
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ import Aesop
error: unsolved goals
α : Type u_1
l0 l1 l2 : List α
fwd : (l0 ++ l1).length ≥ 0
fwd_1 : (l0 ++ l1 ++ l2).length ≥ 0
fwd_2 : l2.length ≥ 0
fwd_3 : l0.length ≥ 0
fwd_4 : l1.length ≥ 0
fwd : l1.length ≥ 0
fwd_1 : (l0 ++ l1).length ≥ 0
fwd_2 : (l0 ++ l1 ++ l2).length ≥ 0
fwd_3 : l2.length ≥ 0
fwd_4 : l0.length ≥ 0
⊢ (l0 ++ l1 ++ l2).length = l0.length + l1.length + l2.length
-/
#guard_msgs in
Expand Down
4 changes: 2 additions & 2 deletions lake-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"type": "git",
"subDir": null,
"scope": "",
"rev": "e8dc5fc16c625fc4fe08f42d625523275ddbbb4b",
"rev": "8ce422eb59adf557fac184f8b1678c75fa03075c",
"name": "batteries",
"manifestFile": "lake-manifest.json",
"inputRev": "v4.15.0",
"inputRev": "v4.16.0-rc1",
"inherited": false,
"configFile": "lakefile.toml"}],
"name": "aesop",
Expand Down
2 changes: 1 addition & 1 deletion lakefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ precompileModules = false # We would like to turn this on, but it breaks the Mat
[[require]]
name = "batteries"
git = "https://github.com/leanprover-community/batteries"
rev = "v4.15.0"
rev = "v4.16.0-rc1"

[[lean_lib]]
name = "Aesop"
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.15.0
leanprover/lean4:v4.16.0-rc1
Loading