This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3454

Assign to result from block.
AcceptedPublic

Authored by kevincox on May 6 2018, 4:17 AM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Summary

This is more idiomatic because you don't have uninitialized variables and has less typing.

Diff Detail

Repository
rHG Mercurial
Branch
arcpatch-D3447 (bookmark) on default (branch)
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

kevincox created this revision.May 6 2018, 4:17 AM
martinvonz added a subscriber: martinvonz.May 9 2018, 5:16 PM

This doesn't apply. Looks like it's based on a version where exit code is 1 (line 193), but our main.rs seems to have always have had it set to 255.

indygreg added a parent revision: D3447: rust: make exit handling consistent with `hg`.May 11 2018, 11:50 PM
indygreg accepted this revision.

It looks like this is based on top of D3447. So I'll just hook up the dependency and we'll land it as soon as my series is landed.

This revision is now accepted and ready to land.May 11 2018, 11:51 PM
durin42 accepted this revision.May 31 2018, 3:07 PM

Revision Contents
Changeset List

PathPackages
Mrust/hgcli/src/main.rs (9 lines)

Diff 8471

rust/hgcli/src/main.rs

// interference. // interference.
let args = args_to_cstrings(); let args = args_to_cstrings();
let argv: Vec<*const c_char> = args.iter().map(|a| a.as_ptr()).collect(); let argv: Vec<*const c_char> = args.iter().map(|a| a.as_ptr()).collect();
unsafe { unsafe {
python27_sys::PySys_SetArgvEx(args.len() as c_int, argv.as_ptr() as *mut *mut i8, 0); python27_sys::PySys_SetArgvEx(args.len() as c_int, argv.as_ptr() as *mut *mut i8, 0);
} }
let result; let result = {
{
// These need to be dropped before we call Py_Finalize(). Hence the // These need to be dropped before we call Py_Finalize(). Hence the
// block. // block.
let gil = Python::acquire_gil(); let gil = Python::acquire_gil();
let py = gil.python(); let py = gil.python();
// Mercurial code could call sys.exit(), which will call exit() // Mercurial code could call sys.exit(), which will call exit()
// itself. So this may not return. // itself. So this may not return.
// TODO this may cause issues on Windows due to the CRT mismatch. // TODO this may cause issues on Windows due to the CRT mismatch.
// Investigate if we can intercept sys.exit() or SystemExit() to // Investigate if we can intercept sys.exit() or SystemExit() to
// ensure we handle process exit. // ensure we handle process exit.
result = match run_py(&env, py) { match run_py(&env, py) {
// Print unhandled exceptions and exit code 1, as this is what // Print unhandled exceptions and exit code 1, as this is what
// `python` does. // `python` does.
Err(err) => { Err(err) => {
err.print(py); err.print(py);
Err(1) Err(1)
} }
Ok(value) => { Ok(value) => {
// dispatch.run() should return an integer exit code // dispatch.run() should return an integer exit code
// between 0 and 255, inclusive. // between 0 and 255, inclusive.
let code = match value.extract::<i32>(py) { let code = match value.extract::<i32>(py) {
Ok(value) => value, Ok(value) => value,
Err(_) => panic!("non-integer value returned by dispatch.run()"), Err(_) => panic!("non-integer value returned by dispatch.run()"),
}; };
Err(code) Err(code)
} }
};
} }
};
unsafe { unsafe {
python27_sys::Py_Finalize(); python27_sys::Py_Finalize();
} }
result result
} }