From dcb66a87576fdb273b5c52aa6dea4f64070c19e6 Mon Sep 17 00:00:00 2001 From: Zoe Stafford Date: Sun, 5 Mar 2023 10:18:20 +0000 Subject: [PATCH 1/2] Remove unused fixity declaration This conflicts with a used one in `Data.String.Parser` --- src/Compiler/ES/Doc.idr | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Compiler/ES/Doc.idr b/src/Compiler/ES/Doc.idr index f2d2eb4b5..7bc4300a7 100644 --- a/src/Compiler/ES/Doc.idr +++ b/src/Compiler/ES/Doc.idr @@ -3,7 +3,6 @@ module Compiler.ES.Doc import Data.List infixr 6 <++> -infixl 8 public export data Doc From c05971482f188e061b0f98fdc78d7a7cc5ac7875 Mon Sep 17 00:00:00 2001 From: Zoe Stafford Date: Sun, 5 Mar 2023 11:14:21 +0000 Subject: [PATCH 2/2] Update Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ff923a19..e62218bc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,6 +68,9 @@ dangerous as Idris will pick an arbitrary one and so the meaning of an expression can depend e.g. on the order in which modules are imported. + * Additionally some conflicting fixity declarations in the Idris 2 compiler + and libraries have been removed. + ### Library changes #### Prelude