diff --git a/Pantograph.lean b/Pantograph.lean index f59bc11..74289d6 100644 --- a/Pantograph.lean +++ b/Pantograph.lean @@ -87,7 +87,7 @@ def execute (command: Protocol.Command): MainM Lean.Json := do } } return .ok { } - options_print (_: Protocol.OptionsPrint): MainM (CR Protocol.OptionsPrintResult) := do + options_print (_: Protocol.OptionsPrint): MainM (CR Protocol.Options) := do return .ok (← get).options goal_start (args: Protocol.GoalStart): MainM (CR Protocol.GoalStartResult) := do let state ← get diff --git a/Pantograph/Goal.lean b/Pantograph/Goal.lean index 17d94c0..921f60b 100644 --- a/Pantograph/Goal.lean +++ b/Pantograph/Goal.lean @@ -169,7 +169,7 @@ protected def GoalState.execute (state: GoalState) (goalId: Nat) (tacticM: Elab. let (_, newGoals) ← tacticM { elaborator := .anonymous } |>.run { goals := [goal] } if (← getThe Core.State).messages.hasErrors then let messages := (← getThe Core.State).messages.getErrorMessages |>.toList.toArray - let errors ← (messages.map Message.data).mapM fun md => md.toString + let errors ← (messages.map (·.data)).mapM fun md => md.toString return .failure errors let nextElabState ← MonadBacktrack.saveState let nextMCtx := nextElabState.meta.meta.mctx @@ -214,7 +214,7 @@ protected def GoalState.assign (state: GoalState) (goal: MVarId) (expr: Expr): goal.assign expr if (← getThe Core.State).messages.hasErrors then let messages := (← getThe Core.State).messages.getErrorMessages |>.toList.toArray - let errors ← (messages.map Message.data).mapM fun md => md.toString + let errors ← (messages.map (·.data)).mapM fun md => md.toString return .failure errors let prevMCtx := state.savedState.term.meta.meta.mctx let nextMCtx ← getMCtx diff --git a/Pantograph/Protocol.lean b/Pantograph/Protocol.lean index 17618fc..f73c3b0 100644 --- a/Pantograph/Protocol.lean +++ b/Pantograph/Protocol.lean @@ -193,7 +193,6 @@ structure OptionsSetResult where deriving Lean.ToJson structure OptionsPrint where deriving Lean.FromJson -abbrev OptionsPrintResult := Options structure GoalStart where -- Only one of the fields below may be populated. diff --git a/Test/Integration.lean b/Test/Integration.lean index 29cb82d..9bd5db6 100644 --- a/Test/Integration.lean +++ b/Test/Integration.lean @@ -65,7 +65,7 @@ def test_option_modify : IO LSpec.TestSeq := subroutine_step "options.print" [] (Lean.toJson ({ options with printExprAST := true }: - Protocol.OptionsPrintResult)) + Protocol.Options)) ] def test_malformed_command : IO LSpec.TestSeq := let invalid := "invalid" diff --git a/flake.lock b/flake.lock index 39888a8..1a50363 100644 --- a/flake.lock +++ b/flake.lock @@ -42,16 +42,16 @@ "nixpkgs-old": "nixpkgs-old" }, "locked": { - "lastModified": 1711508550, - "narHash": "sha256-UK4DnYmwXLcqHA316Zkn0cnujdYlxqUf+b6S4l56Q3s=", + "lastModified": 1714704934, + "narHash": "sha256-q0kLyIahUXolkSrBZSegPF+R99WAH1YC96JfKoFntDE=", "owner": "leanprover", "repo": "lean4", - "rev": "b4caee80a3dfc5c9619d88b16c40cc3db90da4e2", + "rev": "dcccfb73cb247e9478220375ab7de03f7c67e505", "type": "github" }, "original": { "owner": "leanprover", - "ref": "b4caee80a3dfc5c9619d88b16c40cc3db90da4e2", + "ref": "v4.8.0-rc1", "repo": "lean4", "type": "github" } diff --git a/flake.nix b/flake.nix index 2458805..ad40a3f 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; lean = { - url = "github:leanprover/lean4?ref=b4caee80a3dfc5c9619d88b16c40cc3db90da4e2"; # Do not follow input's nixpkgs since it could cause build failures + url = "github:leanprover/lean4?ref=v4.8.0-rc1"; }; lspec = { url = "github:lurk-lab/LSpec?ref=3388be5a1d1390594a74ec469fd54a5d84ff6114"; diff --git a/lean-toolchain b/lean-toolchain index c630636..d8a6d7e 100644 --- a/lean-toolchain +++ b/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:nightly-2024-03-27 +leanprover/lean4:v4.8.0-rc1