This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8400

rust-chg: use "crate::" to import local modules
ClosedPublic

Authored by yuja on Apr 11 2020, 7:24 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6bef9d43cc55: rust-chg: use "crate::" to import local modules
rHGfb1adb7588c6: rust-chg: use "crate::" to import local modules
Summary

I feel it's easier to follow to resolve modules from the crate root than
relative path from self module.

Diff Detail

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

Revision Contents
Changeset List

Diff 21035

rust/chg/src/attachio.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.
//! Functions to send client-side fds over the command server channel. //! Functions to send client-side fds over the command server channel.
use futures::{try_ready, Async, Future, Poll}; use futures::{try_ready, Async, Future, Poll};
use std::io; use std::io;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use tokio_hglib::codec::ChannelMessage; use tokio_hglib::codec::ChannelMessage;
use tokio_hglib::protocol::MessageLoop; use tokio_hglib::protocol::MessageLoop;
use tokio_hglib::{Client, Connection}; use tokio_hglib::{Client, Connection};
use super::message; use crate::message;
use super::procutil; use crate::procutil;
/// Future to send client-side fds over the command server channel. /// Future to send client-side fds over the command server channel.
/// ///
/// This works as follows: /// This works as follows:
/// 1. Client sends "attachio" request. /// 1. Client sends "attachio" request.
/// 2. Server sends back 1-byte input request. /// 2. Server sends back 1-byte input request.
/// 3. Client sends fds with 1-byte dummy payload in response. /// 3. Client sends fds with 1-byte dummy payload in response.
/// 4. Server returns the number of the fds received. /// 4. Server returns the number of the fds received.

rust/chg/src/clientext.rs

use std::io; use std::io;
use std::mem; use std::mem;
use std::os::unix::ffi::OsStrExt; use std::os::unix::ffi::OsStrExt;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::path::Path; use std::path::Path;
use tokio_hglib::protocol::{OneShotQuery, OneShotRequest}; use tokio_hglib::protocol::{OneShotQuery, OneShotRequest};
use tokio_hglib::{Client, Connection}; use tokio_hglib::{Client, Connection};
use super::attachio::AttachIo; use crate::attachio::AttachIo;
use super::message::{self, Instruction}; use crate::message::{self, Instruction};
use super::runcommand::ChgRunCommand; use crate::runcommand::ChgRunCommand;
use super::uihandler::SystemHandler; use crate::uihandler::SystemHandler;
pub trait ChgClientExt<C> pub trait ChgClientExt<C>
where where
C: Connection + AsRawFd, C: Connection + AsRawFd,
{ {
/// Attaches the client file descriptors to the server. /// Attaches the client file descriptors to the server.
fn attach_io<I, O, E>(self, stdin: I, stdout: O, stderr: E) -> AttachIo<C, I, O, E> fn attach_io<I, O, E>(self, stdin: I, stdout: O, stderr: E) -> AttachIo<C, I, O, E>
where where

rust/chg/src/locator.rs

use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process::{self, Command}; use std::process::{self, Command};
use std::time::Duration; use std::time::Duration;
use tokio::prelude::*; use tokio::prelude::*;
use tokio_hglib::UnixClient; use tokio_hglib::UnixClient;
use tokio_process::{Child, CommandExt}; use tokio_process::{Child, CommandExt};
use tokio_timer; use tokio_timer;
use super::clientext::ChgClientExt; use crate::clientext::ChgClientExt;
use super::message::{Instruction, ServerSpec}; use crate::message::{Instruction, ServerSpec};
use super::procutil; use crate::procutil;
const REQUIRED_SERVER_CAPABILITIES: &[&str] = &[ const REQUIRED_SERVER_CAPABILITIES: &[&str] = &[
"attachio", "attachio",
"chdir", "chdir",
"runcommand", "runcommand",
"setenv", "setenv",
"setumask2", "setumask2",
"validate", "validate",

rust/chg/src/runcommand.rs

use futures::{Async, Future, Poll}; use futures::{Async, Future, Poll};
use std::io; use std::io;
use std::mem; use std::mem;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use tokio_hglib::codec::ChannelMessage; use tokio_hglib::codec::ChannelMessage;
use tokio_hglib::protocol::MessageLoop; use tokio_hglib::protocol::MessageLoop;
use tokio_hglib::{Client, Connection}; use tokio_hglib::{Client, Connection};
use super::attachio::AttachIo; use crate::attachio::AttachIo;
use super::message::{self, CommandType}; use crate::message::{self, CommandType};
use super::uihandler::SystemHandler; use crate::uihandler::SystemHandler;
enum AsyncS<R, S> { enum AsyncS<R, S> {
Ready(R), Ready(R),
NotReady(S), NotReady(S),
PollAgain(S), PollAgain(S),
} }
enum CommandState<C, H> enum CommandState<C, H>

rust/chg/src/uihandler.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 futures::future::IntoFuture; use futures::future::IntoFuture;
use futures::Future; use futures::Future;
use std::io; use std::io;
use std::os::unix::io::AsRawFd; use std::os::unix::io::AsRawFd;
use std::os::unix::process::ExitStatusExt; use std::os::unix::process::ExitStatusExt;
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
use tokio; use tokio;
use tokio_process::{ChildStdin, CommandExt}; use tokio_process::{ChildStdin, CommandExt};
use super::message::CommandSpec; use crate::message::CommandSpec;
use super::procutil; use crate::procutil;
/// Callback to process shell command requests received from server. /// Callback to process shell command requests received from server.
pub trait SystemHandler: Sized { pub trait SystemHandler: Sized {
type PagerStdin: AsRawFd; type PagerStdin: AsRawFd;
type SpawnPagerResult: IntoFuture<Item = (Self, Self::PagerStdin), Error = io::Error>; type SpawnPagerResult: IntoFuture<Item = (Self, Self::PagerStdin), Error = io::Error>;
type RunSystemResult: IntoFuture<Item = (Self, i32), Error = io::Error>; type RunSystemResult: IntoFuture<Item = (Self, i32), Error = io::Error>;
/// Handles pager command request. /// Handles pager command request.