This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5435

rust: better treatment of cargo/rustc errors
ClosedPublic

Authored by gracinet on Dec 15 2018, 6:41 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1eaf62a67c1a: rust: better treatment of cargo/rustc errors
rHG5955cf85ed74: rust: better treatment of cargo/rustc errors
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gracinet created this revision.Dec 15 2018, 6:41 AM
yuja added a subscriber: yuja.Dec 15 2018, 10:22 PM

+ cargocmd = ['cargo', 'build', '-vv', '--release']
+ try:
+ subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir)
+ except OSError as exc:
+ if exc.errno == os.errno.ENOENT:

Added import errno to not abuse os.errno. I don't think it's a re-exported
module.

Closed by commit rHG5955cf85ed74: rust: better treatment of cargo/rustc errors (authored by gracinet). · Explain WhyDec 15 2018, 10:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Msetup.py (22 lines)

Diff 12884

setup.py

raise SystemExit( raise SystemExit(
"Couldn't import standard bz2 (incomplete Python install).") "Couldn't import standard bz2 (incomplete Python install).")
ispypy = "PyPy" in sys.version ispypy = "PyPy" in sys.version
iswithrustextensions = 'HGWITHRUSTEXT' in os.environ iswithrustextensions = 'HGWITHRUSTEXT' in os.environ
import ctypes import ctypes
import errno
import stat, subprocess, time import stat, subprocess, time
import re import re
import shutil import shutil
import tempfile import tempfile
from distutils import log from distutils import log
# We have issues with setuptools on some platforms and builders. Until # We have issues with setuptools on some platforms and builders. Until
# those are resolved, setuptools is opt-in except for platforms where # those are resolved, setuptools is opt-in except for platforms where
# we don't have issues. # we don't have issues.
'mercurial/thirdparty/xdiff/xdiffi.h', 'mercurial/thirdparty/xdiff/xdiffi.h',
'mercurial/thirdparty/xdiff/xinclude.h', 'mercurial/thirdparty/xdiff/xinclude.h',
'mercurial/thirdparty/xdiff/xmacros.h', 'mercurial/thirdparty/xdiff/xmacros.h',
'mercurial/thirdparty/xdiff/xprepare.h', 'mercurial/thirdparty/xdiff/xprepare.h',
'mercurial/thirdparty/xdiff/xtypes.h', 'mercurial/thirdparty/xdiff/xtypes.h',
'mercurial/thirdparty/xdiff/xutils.h', 'mercurial/thirdparty/xdiff/xutils.h',
] ]
class RustCompilationError(CCompilerError):
"""Exception class for Rust compilation errors."""
class RustExtension(Extension): class RustExtension(Extension):
"""A C Extension, conditionnally enhanced with Rust code. """A C Extension, conditionnally enhanced with Rust code.
if iswithrustextensions is False, does nothing else than plain Extension if iswithrustextensions is False, does nothing else than plain Extension
""" """
rusttargetdir = os.path.join('rust', 'target', 'release') rusttargetdir = os.path.join('rust', 'target', 'release')
# This happens currently with test-hghave.t, which does # This happens currently with test-hghave.t, which does
# invoke this build. # invoke this build.
# Unix only fix (os.path.expanduser not really reliable if # Unix only fix (os.path.expanduser not really reliable if
# HOME is shadowed like this) # HOME is shadowed like this)
import pwd import pwd
env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir env['HOME'] = pwd.getpwuid(os.getuid()).pw_dir
subprocess.check_call(['cargo', 'build', '-vv', '--release'], cargocmd = ['cargo', 'build', '-vv', '--release']
env=env, cwd=self.rustsrcdir) try:
self.library_dirs.append(self.rusttargetdir) subprocess.check_call(cargocmd, env=env, cwd=self.rustsrcdir)
except OSError as exc:
if exc.errno == errno.ENOENT:
raise RustCompilationError("Cargo not found")
elif exc.errno == errno.EACCES:
raise RustCompilationError(
"Cargo found, but permisssion to execute it is denied")
else:
raise
except subprocess.CalledProcessError:
raise RustCompilationError(
"Cargo failed. Working directory: %r, "
"command: %r, environment: %r" % (self.rustsrcdir, cmd, env))
extmodules = [ extmodules = [
Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'], Extension('mercurial.cext.base85', ['mercurial/cext/base85.c'],
include_dirs=common_include_dirs, include_dirs=common_include_dirs,
depends=common_depends), depends=common_depends),
Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c', Extension('mercurial.cext.bdiff', ['mercurial/bdiff.c',
'mercurial/cext/bdiff.c'] + xdiff_srcs, 'mercurial/cext/bdiff.c'] + xdiff_srcs,
include_dirs=common_include_dirs, include_dirs=common_include_dirs,