From patchwork Sat Apr 11 11:24:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D8400: rust-chg: use "crate::" to import local modules From: phabricator X-Patchwork-Id: 46067 Message-Id: To: Phabricator Cc: mercurial-devel@mercurial-scm.org Date: Sat, 11 Apr 2020 11:24:33 +0000 yuja created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY I feel it's easier to follow to resolve modules from the crate root than relative path from self module. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D8400 AFFECTED 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 CHANGE DETAILS To: yuja, #hg-reviewers Cc: mercurial-devel diff --git a/rust/chg/src/uihandler.rs b/rust/chg/src/uihandler.rs --- a/rust/chg/src/uihandler.rs +++ b/rust/chg/src/uihandler.rs @@ -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 { diff --git a/rust/chg/src/runcommand.rs b/rust/chg/src/runcommand.rs --- a/rust/chg/src/runcommand.rs +++ b/rust/chg/src/runcommand.rs @@ -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 { Ready(R), diff --git a/rust/chg/src/locator.rs b/rust/chg/src/locator.rs --- a/rust/chg/src/locator.rs +++ b/rust/chg/src/locator.rs @@ -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", diff --git a/rust/chg/src/clientext.rs b/rust/chg/src/clientext.rs --- a/rust/chg/src/clientext.rs +++ b/rust/chg/src/clientext.rs @@ -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 where diff --git a/rust/chg/src/attachio.rs b/rust/chg/src/attachio.rs --- a/rust/chg/src/attachio.rs +++ b/rust/chg/src/attachio.rs @@ -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. ///