mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 01:39:21 +03:00
clidispatch: rename CommandType to CommandFunc
Summary: The enum owns the function of the command. Rename to make it clear. Reviewed By: sfilipco Differential Revision: D16733262 fbshipit-source-id: 6fdc7e999b0863b2a7b35203ac704928f8f92cd2
This commit is contained in:
parent
8ec9e492ff
commit
f6659524bc
@ -7,7 +7,7 @@ use crate::io::IO;
|
||||
use crate::repo::Repo;
|
||||
use cliparser::parser::{Flag, ParseOutput};
|
||||
|
||||
pub enum CommandType {
|
||||
pub enum CommandFunc {
|
||||
NoRepo(Box<dyn Fn(ParseOutput, &mut IO) -> Result<u8, DispatchError>>),
|
||||
InferRepo(Box<dyn Fn(ParseOutput, &mut IO, Option<Repo>) -> Result<u8, DispatchError>>),
|
||||
Repo(Box<dyn Fn(ParseOutput, &mut IO, Repo) -> Result<u8, DispatchError>>),
|
||||
|
@ -2,7 +2,7 @@
|
||||
//
|
||||
// This software may be used and distributed according to the terms of the
|
||||
// GNU General Public License version 2 or any later version.
|
||||
use crate::command::{CommandDefinition, CommandType};
|
||||
use crate::command::{CommandDefinition, CommandFunc};
|
||||
use crate::errors::{DispatchError, HighLevelError};
|
||||
use crate::global_flags::HG_GLOBAL_FLAGS;
|
||||
use crate::io::IO;
|
||||
@ -104,7 +104,7 @@ pub fn args() -> Result<Vec<String>, DispatchError> {
|
||||
}
|
||||
|
||||
pub struct Dispatcher {
|
||||
command_table: BTreeMap<String, CommandType>,
|
||||
command_table: BTreeMap<String, CommandFunc>,
|
||||
commands: BTreeMap<String, CommandDefinition>,
|
||||
}
|
||||
|
||||
@ -416,7 +416,7 @@ impl Dispatcher {
|
||||
let handler = self.command_table.get(&command_name).unwrap();
|
||||
|
||||
let res = match handler {
|
||||
CommandType::Repo(f) => {
|
||||
CommandFunc::Repo(f) => {
|
||||
let mut r = repo.ok_or_else(|| DispatchError::RepoRequired {
|
||||
cwd: env::current_dir()
|
||||
.ok()
|
||||
@ -427,7 +427,7 @@ impl Dispatcher {
|
||||
r.set_config(config_set);
|
||||
f(result, io, r)
|
||||
}
|
||||
CommandType::InferRepo(f) => {
|
||||
CommandFunc::InferRepo(f) => {
|
||||
let r = match repo {
|
||||
Some(mut re) => {
|
||||
re.set_config(config_set);
|
||||
@ -437,7 +437,7 @@ impl Dispatcher {
|
||||
};
|
||||
f(result, io, r)
|
||||
}
|
||||
CommandType::NoRepo(f) => f(result, io),
|
||||
CommandFunc::NoRepo(f) => f(result, io),
|
||||
};
|
||||
|
||||
res
|
||||
@ -461,7 +461,7 @@ where
|
||||
};
|
||||
self.command_table.insert(
|
||||
command.name().to_owned(),
|
||||
CommandType::NoRepo(Box::new(wrapped)),
|
||||
CommandFunc::NoRepo(Box::new(wrapped)),
|
||||
);
|
||||
self.add_command(command);
|
||||
}
|
||||
@ -480,7 +480,7 @@ where
|
||||
};
|
||||
self.command_table.insert(
|
||||
command.name().to_owned(),
|
||||
CommandType::InferRepo(Box::new(wrapped)),
|
||||
CommandFunc::InferRepo(Box::new(wrapped)),
|
||||
);
|
||||
self.add_command(command);
|
||||
}
|
||||
@ -499,7 +499,7 @@ where
|
||||
};
|
||||
self.command_table.insert(
|
||||
command.name().to_owned(),
|
||||
CommandType::Repo(Box::new(wrapped)),
|
||||
CommandFunc::Repo(Box::new(wrapped)),
|
||||
);
|
||||
self.add_command(command);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user