This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch erlfmt-1.3.0
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit ce92dd585bd3cf2a1e50d3b4f381a86e34ea83f8
Author: Robert Newson <rnew...@apache.org>
AuthorDate: Thu Nov 9 17:36:33 2023 +0000

    update erlfmt to 1.3.0 and fix issues
---
 configure                           | 3 ++-
 src/mango/src/mango_cursor_view.erl | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index df363df73..8ed9817d2 100755
--- a/configure
+++ b/configure
@@ -22,6 +22,7 @@ basename=`basename $0`
 PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
 
 REBAR3_BRANCH="3.21.0"
+ERLFMT_VERSION="v1.3.0"
 
 # TEST=0
 WITH_PROPER="true"
@@ -334,7 +335,7 @@ install_local_rebar3() {
 install_local_erlfmt() {
     if [ ! -x "${rootdir}/bin/erlfmt" ]; then
         if [ ! -d "${rootdir}/src/erlfmt" ]; then
-            git clone --depth 1 https://github.com/WhatsApp/erlfmt.git 
${rootdir}/src/erlfmt
+            git clone --depth 1 --branch "${ERLFMT_VERSION}" 
https://github.com/WhatsApp/erlfmt.git ${rootdir}/src/erlfmt
         fi
         cd "${rootdir}"/src/erlfmt
         ${REBAR3} as release escriptize
diff --git a/src/mango/src/mango_cursor_view.erl 
b/src/mango/src/mango_cursor_view.erl
index 41006ce77..b1357ac68 100644
--- a/src/mango/src/mango_cursor_view.erl
+++ b/src/mango/src/mango_cursor_view.erl
@@ -52,13 +52,13 @@
     #{
         selector => selector(),
         fields => fields(),
-        covering_index => maybe(#idx{})
+        covering_index => 'maybe'(#idx{})
     }.
 
 -spec viewcbargs_new(Selector, Fields, CoveringIndex) -> ViewCBArgs when
     Selector :: selector(),
     Fields :: fields(),
-    CoveringIndex :: maybe(#idx{}),
+    CoveringIndex :: 'maybe'(#idx{}),
     ViewCBArgs :: viewcbargs().
 viewcbargs_new(Selector, Fields, CoveringIndex) ->
     #{
@@ -67,7 +67,7 @@ viewcbargs_new(Selector, Fields, CoveringIndex) ->
         covering_index => CoveringIndex
     }.
 
--spec viewcbargs_get(Key, Args) -> maybe(term()) when
+-spec viewcbargs_get(Key, Args) -> 'maybe'(term()) when
     Key :: selector | fields | covering_index,
     Args :: viewcbargs().
 viewcbargs_get(selector, Args) when is_map(Args) ->
@@ -426,7 +426,7 @@ view_cb(ok, ddoc_updated) ->
 -spec match_and_extract_doc(Doc, Selector, Fields) -> Result when
     Doc :: ejson(),
     Selector :: selector(),
-    Fields :: maybe(fields()),
+    Fields :: 'maybe'(fields()),
     Result :: {match, term()} | {no_match, undefined}.
 match_and_extract_doc(Doc, Selector, Fields) ->
     case mango_selector:match(Selector, Doc) of

Reply via email to