Mercurial > hg-stable
changeset 44690:6bef9d43cc55
rust-chg: use "crate::" to import local modules
I feel it's easier to follow to resolve modules from the crate root than
relative path from self module.
Differential Revision: https://phab.mercurial-scm.org/D8400
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 10 Apr 2020 21:38:08 +0900 |
parents | 1f5ab1a9363d |
children | 44aff45b556d |
files | rust/chg/src/attachio.rs rust/chg/src/clientext.rs rust/chg/src/locator.rs rust/chg/src/runcommand.rs rust/chg/src/uihandler.rs |
diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/chg/src/attachio.rs Fri Apr 10 21:35:16 2020 +0900 +++ b/rust/chg/src/attachio.rs Fri Apr 10 21:38:08 2020 +0900 @@ -12,8 +12,8 @@ use tokio_hglib::protocol::MessageLoop; use tokio_hglib::{Client, Connection}; -use super::message; -use super::procutil; +use crate::message; +use crate::procutil; /// Future to send client-side fds over the command server channel. ///
--- a/rust/chg/src/clientext.rs Fri Apr 10 21:35:16 2020 +0900 +++ b/rust/chg/src/clientext.rs Fri Apr 10 21:38:08 2020 +0900 @@ -15,10 +15,10 @@ use tokio_hglib::protocol::{OneShotQuery, OneShotRequest}; use tokio_hglib::{Client, Connection}; -use super::attachio::AttachIo; -use super::message::{self, Instruction}; -use super::runcommand::ChgRunCommand; -use super::uihandler::SystemHandler; +use crate::attachio::AttachIo; +use crate::message::{self, Instruction}; +use crate::runcommand::ChgRunCommand; +use crate::uihandler::SystemHandler; pub trait ChgClientExt<C> where
--- a/rust/chg/src/locator.rs Fri Apr 10 21:35:16 2020 +0900 +++ b/rust/chg/src/locator.rs Fri Apr 10 21:38:08 2020 +0900 @@ -21,9 +21,9 @@ use tokio_process::{Child, CommandExt}; use tokio_timer; -use super::clientext::ChgClientExt; -use super::message::{Instruction, ServerSpec}; -use super::procutil; +use crate::clientext::ChgClientExt; +use crate::message::{Instruction, ServerSpec}; +use crate::procutil; const REQUIRED_SERVER_CAPABILITIES: &[&str] = &[ "attachio",
--- a/rust/chg/src/runcommand.rs Fri Apr 10 21:35:16 2020 +0900 +++ b/rust/chg/src/runcommand.rs Fri Apr 10 21:38:08 2020 +0900 @@ -15,9 +15,9 @@ use tokio_hglib::protocol::MessageLoop; use tokio_hglib::{Client, Connection}; -use super::attachio::AttachIo; -use super::message::{self, CommandType}; -use super::uihandler::SystemHandler; +use crate::attachio::AttachIo; +use crate::message::{self, CommandType}; +use crate::uihandler::SystemHandler; enum AsyncS<R, S> { Ready(R),
--- a/rust/chg/src/uihandler.rs Fri Apr 10 21:35:16 2020 +0900 +++ b/rust/chg/src/uihandler.rs Fri Apr 10 21:38:08 2020 +0900 @@ -12,8 +12,8 @@ use tokio; use tokio_process::{ChildStdin, CommandExt}; -use super::message::CommandSpec; -use super::procutil; +use crate::message::CommandSpec; +use crate::procutil; /// Callback to process shell command requests received from server. pub trait SystemHandler: Sized {