( )⚙ D8448 rust-chg: modernize entry function

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8448

rust-chg: modernize entry function
ClosedPublic

Authored by yuja on Apr 16 2020, 8:30 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9fc9526e283a: rust-chg: modernize entry function
Summary

Finally the entire build passes.

There's a bug that run() no longer waits for the spawned pager, which will
be fixed by the next patch.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

yuja created this revision.Apr 16 2020, 8:30 AM
durin42 added a subscriber: durin42.Apr 16 2020, 12:29 PM
durin42 added inline comments.
rust/chg/src/main.rs
70

With this series I get lots of

+ error[E0670]: async fn` is not permitted in the 2015 edition`

from test-check-rust-format.t. Am I doing something wrong?

yuja added a comment.Apr 17 2020, 6:47 AM

+ error[E0670]: async fn` is not permitted in the 2015 edition`

Appears that we need to specify --edition=2018. Sent patch.

Alphare accepted this revision.Apr 17 2020, 8:31 AM
marmoute added a subscriber: marmoute.Apr 22 2020, 12:15 PM
In D8448#126114, @yuja wrote:

+ error[E0670]: async fn` is not permitted in the 2015 edition`

Appears that we need to specify --edition=2018. Sent patch.

Patch was sent, the series looks ready to land.

yuja added a commit: rHG9fc9526e283a: rust-chg: modernize entry function.Apr 23 2020, 2:03 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9fc9526e283a: rust-chg: modernize entry function (authored by yuja). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/chg/Cargo.toml (3 lines)
Mrust/chg/src/main.rs (46 lines)

Diff 21125

rust/chg/Cargo.toml

[package] [package]
name = "chg" name = "chg"
version = "0.1.0" version = "0.1.0"
authors = ["Yuya Nishihara <yuya@tcha.org>"] authors = ["Yuya Nishihara <yuya@tcha.org>"]
description = "Client for Mercurial command server with cHg extension" description = "Client for Mercurial command server with cHg extension"
license = "GPL-2.0+" license = "GPL-2.0+"
edition = "2018" edition = "2018"
# TODO: enable auto discovery
autobins = false
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1"
bytes = "0.5" bytes = "0.5"
futures = "0.3" futures = "0.3"
libc = "0.2" libc = "0.2"
log = { version = "0.4", features = ["std"] } log = { version = "0.4", features = ["std"] }
tokio-hglib = "0.3" tokio-hglib = "0.3"
[dependencies.tokio] [dependencies.tokio]
version = "0.2" version = "0.2"
features = ["rt-core", "io-util", "time", "process", "macros"] features = ["rt-core", "io-util", "time", "process", "macros"]
[build-dependencies] [build-dependencies]
cc = "1.0" cc = "1.0"

rust/chg/src/main.rs

// Copyright 2018 Yuya Nishihara <yuya@tcha.org> // Copyright 2018 Yuya Nishihara <yuya@tcha.org>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use chg::locator::{self, Locator}; use chg::locator::{self, Locator};
use chg::procutil; use chg::procutil;
use chg::{ChgClientExt, ChgUiHandler}; use chg::ChgUiHandler;
use futures::sync::oneshot;
use std::env; use std::env;
use std::io; use std::io;
use std::io::Write;
use std::process; use std::process;
use std::time::Instant; use std::time::Instant;
use tokio::prelude::*;
struct DebugLogger { struct DebugLogger {
start: Instant, start: Instant,
} }
impl DebugLogger { impl DebugLogger {
pub fn new() -> DebugLogger { pub fn new() -> DebugLogger {
DebugLogger { DebugLogger {
let umask = unsafe { procutil::get_umask() }; // not thread safe let umask = unsafe { procutil::get_umask() }; // not thread safe
let code = run(umask).unwrap_or_else(|err| { let code = run(umask).unwrap_or_else(|err| {
writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(()); writeln!(io::stderr(), "chg: abort: {}", err).unwrap_or(());
255 255
}); });
process::exit(code); process::exit(code);
} }
fn run(umask: u32) -> io::Result<i32> { #[tokio::main]
async fn run(umask: u32) -> io::Result<i32> {
durin42Unsubmitted
Not Done

With this series I get lots of

+ error[E0670]: async fn` is not permitted in the 2015 edition`

from test-check-rust-format.t. Am I doing something wrong?

durin42: With this series I get lots of `+ error[E0670]: `async fn` is not permitted in the 2015…
let mut loc = Locator::prepare_from_env()?; let mut loc = Locator::prepare_from_env()?;
loc.set_early_args(locator::collect_early_args(env::args_os().skip(1))); loc.set_early_args(locator::collect_early_args(env::args_os().skip(1)));
let handler = ChgUiHandler::new(); let mut handler = ChgUiHandler::new();
let (result_tx, result_rx) = oneshot::channel(); let mut client = loc.connect().await?;
let fut = loc client
.connect() .attach_io(&io::stdin(), &io::stdout(), &io::stderr())
.and_then(|(_, client)| client.attach_io(io::stdin(), io::stdout(), io::stderr())) .await?;
.and_then(move |client| client.set_umask(umask)) client.set_umask(umask).await?;
.and_then(|client| {
let pid = client.server_spec().process_id.unwrap(); let pid = client.server_spec().process_id.unwrap();
let pgid = client.server_spec().process_group_id; let pgid = client.server_spec().process_group_id;
procutil::setup_signal_handler_once(pid, pgid)?; procutil::setup_signal_handler_once(pid, pgid)?;
Ok(client) let code = client
}) .run_command_chg(&mut handler, env::args_os().skip(1))
.and_then(|client| client.run_command_chg(handler, env::args_os().skip(1))) .await?;
.map(|(_client, _handler, code)| {
procutil::restore_signal_handler_once()?; procutil::restore_signal_handler_once()?;
Ok(code) Ok(code)
})
.or_else(|err| Ok(Err(err))) // pass back error to caller
.map(|res| result_tx.send(res).unwrap());
tokio::run(fut);
result_rx.wait().unwrap_or(Err(io::Error::new(
io::ErrorKind::Other,
"no exit code set",
)))
} }