diff -r 58c74a517a00 -r 71e13cfd6154 mercurial/dirstate.py
--- a/mercurial/dirstate.py	Thu Jan 30 14:57:02 2020 +0100
+++ b/mercurial/dirstate.py	Wed Feb 12 23:23:59 2020 +0100
@@ -1846,12 +1846,12 @@
 
         @property
         def nonnormalset(self):
-            nonnorm, otherparents = self._rustmap.nonnormalentries()
+            nonnorm = self._rustmap.non_normal_entries()
             return nonnorm
 
         @propertycache
         def otherparentset(self):
-            nonnorm, otherparents = self._rustmap.nonnormalentries()
+            otherparents = self._rustmap.other_parent_entries()
             return otherparents
 
         @propertycache