diff -r 2f86f259aefa -r 8298e55fc9a4 mercurial/util.py
--- a/mercurial/util.py	Fri May 11 00:55:01 2018 -0400
+++ b/mercurial/util.py	Thu May 10 21:34:40 2018 -0400
@@ -3860,15 +3860,3 @@
 hgcmd = _deprecatedfunc(procutil.hgcmd, '4.6')
 rundetached = _deprecatedfunc(procutil.rundetached, '4.6')
 
-binary = _deprecatedfunc(stringutil.binary, '4.6')
-stringmatcher = _deprecatedfunc(stringutil.stringmatcher, '4.6')
-shortuser = _deprecatedfunc(stringutil.shortuser, '4.6')
-emailuser = _deprecatedfunc(stringutil.emailuser, '4.6')
-email = _deprecatedfunc(stringutil.email, '4.6')
-ellipsis = _deprecatedfunc(stringutil.ellipsis, '4.6')
-escapestr = _deprecatedfunc(stringutil.escapestr, '4.6')
-unescapestr = _deprecatedfunc(stringutil.unescapestr, '4.6')
-forcebytestr = _deprecatedfunc(stringutil.forcebytestr, '4.6')
-uirepr = _deprecatedfunc(stringutil.uirepr, '4.6')
-wrap = _deprecatedfunc(stringutil.wrap, '4.6')
-parsebool = _deprecatedfunc(stringutil.parsebool, '4.6')