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: move to v4.7.0-rc1 #35

Merged
merged 3 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 0 additions & 1 deletion REPL/Frontend.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Scott Morrison
-/
import Lean.Elab.Frontend
import REPL.Util.TermUnsafe

open Lean Elab

Expand Down
1 change: 0 additions & 1 deletion REPL/Main.lean
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Authors: Scott Morrison
import REPL.JSON
import REPL.Frontend
import REPL.Util.Path
import REPL.Util.TermUnsafe
import REPL.Lean.ContextInfo
import REPL.Lean.Environment
import REPL.Lean.InfoTree
Expand Down
1 change: 1 addition & 0 deletions REPL/Snapshots.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Scott Morrison
-/
import Lean.Replay
import Lean.Elab.Command
import REPL.Util.Pickle

open Lean Elab
Expand Down
2 changes: 1 addition & 1 deletion REPL/Util/Pickle.lean
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright (c) 2023 Mario Carneiro. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Mario Carneiro
-/
import REPL.Util.TermUnsafe
import Lean.Environment

/-!
# Pickling and unpickling objects
Expand Down
63 changes: 0 additions & 63 deletions REPL/Util/TermUnsafe.lean

This file was deleted.

2 changes: 1 addition & 1 deletion lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:v4.6.0
leanprover/lean4:v4.7.0-rc1
16 changes: 8 additions & 8 deletions test/Mathlib/lake-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
[{"url": "https://github.com/leanprover/std4",
"type": "git",
"subDir": null,
"rev": "a7543d1a6934d52086971f510e482d743fe30cf3",
"rev": "ff9850c4726f6b9fb8d8e96980c3fcb2900be8bd",
"name": "std",
"manifestFile": "lake-manifest.json",
"inputRev": "v4.6.0",
"inputRev": "main",
"inherited": true,
"configFile": "lakefile.lean"},
{"url": "https://github.com/leanprover-community/quote4",
Expand All @@ -22,19 +22,19 @@
{"url": "https://github.com/leanprover-community/aesop",
"type": "git",
"subDir": null,
"rev": "c51fa8ea4de8b203f64929cba19d139e555f9f6b",
"rev": "056ca0fa8f5585539d0b940f532d9750c3a2270f",
"name": "aesop",
"manifestFile": "lake-manifest.json",
"inputRev": "v4.6.0",
"inputRev": "master",
"inherited": true,
"configFile": "lakefile.lean"},
{"url": "https://github.com/leanprover-community/ProofWidgets4",
"type": "git",
"subDir": null,
"rev": "16cae05860b208925f54e5581ec5fd264823440c",
"rev": "fb65c476595a453a9b8ffc4a1cea2db3a89b9cd8",
"name": "proofwidgets",
"manifestFile": "lake-manifest.json",
"inputRev": "v0.0.29",
"inputRev": "v0.0.30",
"inherited": true,
"configFile": "lakefile.lean"},
{"url": "https://github.com/leanprover/lean4-cli",
Expand All @@ -58,10 +58,10 @@
{"url": "https://github.com/leanprover-community/mathlib4",
"type": "git",
"subDir": null,
"rev": "7ca43cbd6aa34058a1afad8e47190af3ec1f9bdb",
"rev": "fa48894a5d2780c6593a224003a660ca039e3e8f",
"name": "mathlib",
"manifestFile": "lake-manifest.json",
"inputRev": "v4.6.0",
"inputRev": "v4.7.0-rc1",
"inherited": false,
"configFile": "lakefile.lean"}],
"name": "«repl-mathlib-tests»",
Expand Down
2 changes: 1 addition & 1 deletion test/Mathlib/lakefile.lean
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ open Lake DSL

package «repl-mathlib-tests» where
-- add package configuration options here
require mathlib from git "https://github.com/leanprover-community/mathlib4" @ "v4.6.0"
require mathlib from git "https://github.com/leanprover-community/mathlib4" @ "v4.7.0-rc1"

@[default_target]
lean_lib «ReplMathlibTests» where
Expand Down
2 changes: 1 addition & 1 deletion test/Mathlib/lean-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
leanprover/lean4:v4.6.0
leanprover/lean4:v4.7.0-rc1
4 changes: 1 addition & 3 deletions test/Mathlib/test/20240209.expected.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{"env": 0}

{"sorries":
[{"proofState": 0,
"pos": {"line": 1, "column": 22},
Expand All @@ -10,7 +8,7 @@
"pos": {"line": 1, "column": 0},
"endPos": {"line": 1, "column": 7},
"data": "declaration uses 'sorry'"}],
"env": 1}
"env": 0}

{"proofState": 1,
"messages":
Expand Down
4 changes: 1 addition & 3 deletions test/Mathlib/test/20240209.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{"cmd": "import Std.Tactic.Simpa"}

{"cmd": "example : False := by sorry", "env": 0}
{"cmd": "example : False := by sorry"}

{"tactic": "simpa using show False by done", "proofState": 0}
10 changes: 5 additions & 5 deletions test/by_cases.expected.out
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

{"proofState": 1,
"goals":
["case inl\nx : Int\nh : x < 0\n⊢ x = x",
"case inr\nx : Int\nh : ¬x < 0\n⊢ x = x"]}
["case pos\nx : Int\nh : x < 0\n⊢ x = x",
"case neg\nx : Int\nh : ¬x < 0\n⊢ x = x"]}

{"proofState": 2, "goals": ["case inr\nx : Int\nh : ¬x < 0\n⊢ x = x"]}
{"proofState": 2, "goals": ["case neg\nx : Int\nh : ¬x < 0\n⊢ x = x"]}

{"sorries":
[{"proofState": 3, "goal": "case inl\nx : Int\nh : x < 0\n⊢ x = x"},
{"proofState": 4, "goal": "case inr\nx : Int\nh : ¬x < 0\n⊢ x = x"}],
[{"proofState": 3, "goal": "case pos\nx : Int\nh : x < 0\n⊢ x = x"},
{"proofState": 4, "goal": "case neg\nx : Int\nh : ¬x < 0\n⊢ x = x"}],
"proofState": 5,
"goals": []}

2 changes: 1 addition & 1 deletion test/by_cases.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{"proofState" : 0, "tactic": "by_cases h : x < 0"}

{"proofState" : 1, "tactic": "case inl => rfl"}
{"proofState" : 1, "tactic": "case pos => rfl"}

{"proofState" : 1, "tactic": "all_goals sorry"}

8 changes: 6 additions & 2 deletions test/name_generator.expected.out
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@
"proofState": 5,
"goals": []}

{"traces": ["[Meta.Tactic.simp.rewrite] h0:1000, x > 0 ==> True"],
{"traces":
["[Meta.Tactic.simp.rewrite] @gt_iff_lt:1000, x > 0 ==> 0 < x",
"[Meta.Tactic.simp.rewrite] h0:1000, 0 < x ==> True"],
"proofState": 6,
"goals": []}

{"traces": ["[Meta.Tactic.simp.rewrite] h0:1000, x > 0 ==> True"],
{"traces":
["[Meta.Tactic.simp.rewrite] @gt_iff_lt:1000, x > 0 ==> 0 < x",
"[Meta.Tactic.simp.rewrite] h0:1000, 0 < x ==> True"],
"proofState": 7,
"goals": []}

Expand Down
Loading