From 5736e15a5dbd3eac3e98b539df00dfd147585482 Mon Sep 17 00:00:00 2001
From: Kim Morrison <kim@tqft.net>
Date: Wed, 16 Oct 2024 20:54:30 +1100
Subject: [PATCH] fixes for leanprover/lean4#5731

---
 Aesop/Frontend/Attribute.lean | 2 +-
 lake-manifest.json            | 4 ++--
 lakefile.toml                 | 2 +-
 lean-toolchain                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Aesop/Frontend/Attribute.lean b/Aesop/Frontend/Attribute.lean
index 4c53e46e..f05b433f 100644
--- a/Aesop/Frontend/Attribute.lean
+++ b/Aesop/Frontend/Attribute.lean
@@ -51,7 +51,7 @@ initialize registerBuiltinAttribute {
   add := λ decl stx attrKind => withRef stx do
     let rules ← runTermElabMAsCoreM do
       let config ← AttrConfig.elab stx
-      config.rules.concatMapM (·.buildAdditionalGlobalRules decl)
+      config.rules.flatMapM (·.buildAdditionalGlobalRules decl)
     for (rule, rsNames) in rules do
       for rsName in rsNames do
         addGlobalRule rsName rule attrKind (checkNotExists := true)
diff --git a/lake-manifest.json b/lake-manifest.json
index 91adc8d8..381d38d0 100644
--- a/lake-manifest.json
+++ b/lake-manifest.json
@@ -5,10 +5,10 @@
    "type": "git",
    "subDir": null,
    "scope": "",
-   "rev": "fc871f7039ac6d8ab993335bb35aba43286004a0",
+   "rev": "b4cb0a5212271f661c27f52ef0923be1ec3ddd0b",
    "name": "batteries",
    "manifestFile": "lake-manifest.json",
-   "inputRev": "main",
+   "inputRev": "lean-pr-testing-5731",
    "inherited": false,
    "configFile": "lakefile.lean"}],
  "name": "aesop",
diff --git a/lakefile.toml b/lakefile.toml
index 96a10fd8..c8872a18 100644
--- a/lakefile.toml
+++ b/lakefile.toml
@@ -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 = "main"
+rev = "lean-pr-testing-5731"
 
 [[lean_lib]]
 name = "Aesop"
diff --git a/lean-toolchain b/lean-toolchain
index a0079780..0be20ac1 100644
--- a/lean-toolchain
+++ b/lean-toolchain
@@ -1 +1 @@
-leanprover/lean4:v4.13.0-rc1
+leanprover/lean4-pr-releases:pr-release-5731