From 82c77a0b2e8ee75c2a000ee862fbc2324be36d25 Mon Sep 17 00:00:00 2001
From: Yaroslav Dynnikov <yaroslav.dynnikov@gmail.com>
Date: Wed, 27 Apr 2022 17:09:05 +0300
Subject: [PATCH] chore: remove unused clap arguments
---
src/args.rs | 18 ------------------
src/main.rs | 2 +-
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/src/args.rs b/src/args.rs
index 4296bddcb4..a1971128df 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -79,22 +79,9 @@ pub struct Run {
/// Address of other instance(s)
pub peers: Vec<String>,
- #[clap(hide = true, env = "PICODATA_RAFT_ID")]
- pub raft_id: Option<u64>,
-
#[clap(long, value_name = "name", env = "PICODATA_REPLICASET_ID")]
/// Name of the replicaset
pub replicaset_id: Option<String>,
-
- #[clap(
- hide = true,
- long = "picolib-autorun",
- env = "PICOLIB_AUTORUN",
- parse(from_str = parse_flag),
- default_value = "true",
- )]
- /// Only used for testing. Should probably be removed at this point
- pub autorun: bool,
}
impl Run {
@@ -168,11 +155,6 @@ fn current_exe() -> Result<CString, String> {
.map_err(|e| format!("Current executable path contains nul bytes: {e}"))
}
-fn parse_flag(text: &str) -> bool {
- let text = text.to_lowercase();
- matches!(text.as_str(), "on" | "true" | "yes") || text.parse::<i64>().unwrap_or(0) != 0
-}
-
#[derive(Error, Debug)]
pub enum ParseAddressError {
#[error("bad address: {0}")]
diff --git a/src/main.rs b/src/main.rs
index 4934f4d22c..7e1acbb0fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,3 @@
-use clap::StructOpt;
use nix::sys::signal;
use nix::sys::termios::{tcgetattr, tcsetattr, SetArg::TCSADRAIN};
use nix::sys::wait::WaitStatus;
@@ -13,6 +12,7 @@ use ::tarantool::transaction::start_transaction;
use std::convert::TryFrom;
use std::time::{Duration, Instant};
+use clap::StructOpt as _;
use protobuf::Message as _;
use protobuf::ProtobufEnum as _;
--
GitLab