athaller/hstdb - Change IA2CJ4HDSST6MPDLX2FVE2ZZR7EP5O6AIAUFGZIMWJ6NODVMKOKAC

More clippy

Created by Alexander Thaller on September 28, 2020

IA2CJ4HDSST6MPDLX2FVE2ZZR7EP5O6AIAUFGZIMWJ6NODVMKOKAC

Dependencies

In channels

main

Change contents

Replacement in src/client.rs at line 28 [3.2791]

B:BD[3.2964] → [4.5617:5662]

pub fn new(socket_path: PathBuf) -> Client {

[3.2964]

[4.5662]

pub const fn new(socket_path: PathBuf) -> Client {

Replacement in src/client.rs at line 33 [3.2791]

B:BD[3.3020] → [3.3020:3084]

    pub fn send(&self, message: Message) -> Result<(), Error> {

[3.3020]

[5.349]

    pub fn send(&self, message: &Message) -> Result<(), Error> {

Replacement in src/entry.rs at line 29 [6.7188]

B:BD[6.8095] → [3.3709:3790]

    pub fn from_messages(start: CommandStart, finish: CommandFinished) -> Self {

[6.8095]

[3.3790]

    #[allow(clippy::missing_const_for_fn)]
    pub fn from_messages(start: CommandStart, finish: &CommandFinished) -> Self {

Replacement in src/message.rs at line 75 [3.4653]

B:BD[3.6271] → [3.6271:6333]

                _ => Err(Error::InvalidSessionIDEnvVar(err)),

[3.6271]

[3.6333]

                env::VarError::NotUnicode(_) => Err(Error::InvalidSessionIDEnvVar(err)),

Replacement in src/message.rs at line 111 [3.4653]

B:BD[3.7021] → [3.7021:7083]

                _ => Err(Error::InvalidSessionIDEnvVar(err)),

[3.7021]

[3.7083]

                env::VarError::NotUnicode(_) => Err(Error::InvalidSessionIDEnvVar(err)),

Replacement in src/opt.rs at line 6 [4.5920]

B:BD[4.6313] → [4.6313:6339]

    clap::AppSettings::*,

[4.6313]

[4.6339]

    clap::AppSettings::{
        ColoredHelp,
        GlobalVersion,
        NextLineHelp,
        VersionlessSubcommands,
    },

Insertion in src/opt.rs at line 117 [4.5920]
[4.7644]
[4.7644]
```
#[allow(clippy::struct_excessive_bools)]
```

Replacement in src/opt.rs at line 218 [4.5920]

B:BD[4.9986] → [4.9986:10068]

B:BD[4.10068] → [7.770:820]

B:BD[7.820] → [8.102:181]

∅:D[8.181] → [7.904:965]

B:BD[7.904] → [7.904:965]

B:BD[7.965] → [8.182:276]

∅:D[8.276] → [7.1064:1082]

B:BD[7.1064] → [7.1064:1082]

B:BD[7.1082] → [8.277:632]

∅:D[8.632] → [4.10730:10745]

∅:D[7.1178] → [4.10730:10745]

∅:D[9.1767] → [4.10730:10745]

B:BD[4.10730] → [4.10730:10745]

∅:D[10.290] → [4.11099:11100]

∅:D[7.1425] → [4.11099:11100]

B:BD[4.11099] → [4.11099:11100]

B:BD[4.11100] → [8.633:1443]


        match sub_command {
            Some(sub_command) => match sub_command {
                SubCommand::ZSHAddHistory(o) => {
                    run::zsh_add_history(o.command, o.socket_path.socket_path)
                }
                SubCommand::Server(o) => {
                    run::server(o.cache_path, o.socket_path.socket_path, o.data_dir.data_dir)
                }
                SubCommand::Stop(o) => run::stop(o.socket_path),
                SubCommand::PreCmd(o) => run::precmd(o.socket_path),
                SubCommand::SessionID => run::session_id(),
                SubCommand::Running(o) => run::running(o.socket_path),
                SubCommand::Import(o) => run::import(o.import_file, o.data_dir.data_dir),
            },
            None => {
                let in_current = self.default_args.in_current;
                let folder = self.default_args.folder;
                let all_hosts = self.default_args.all_hosts;
                let hostname = self.default_args.hostname;
                let data_dir = self.default_args.data_dir.data_dir;
                let entries_count = self.default_args.entries_count;
                let command = self.default_args.command;
                let no_subdirs = self.default_args.no_subdirs;
                let command_text = self.default_args.command_text;
                let no_format = self.default_args.no_format;
                let host = self.default_args.host;
                let duration = self.default_args.duration;
                let status = self.default_args.status;

[4.9986]

[4.11617]

        let in_current = self.default_args.in_current;
        let folder = self.default_args.folder;
        let all_hosts = self.default_args.all_hosts;
        let hostname = self.default_args.hostname;
        let data_dir = self.default_args.data_dir.data_dir;
        let entries_count = self.default_args.entries_count;
        let command = self.default_args.command;
        let no_subdirs = self.default_args.no_subdirs;
        let command_text = self.default_args.command_text;
        let no_format = self.default_args.no_format;
        let host = self.default_args.host;
        let duration = self.default_args.duration;
        let status = self.default_args.status;

Insertion in src/opt.rs at line 232 [4.5920]

[4.11618]

[8.1444]

        sub_command.map_or_else(
            || {

Replacement in src/opt.rs at line 241 [4.5920]

B:BD[8.1660] → [8.1660:1689]

                    command,

[8.1660]

[8.1689]

                    &command,

Replacement in src/opt.rs at line 243 [4.5920]

B:BD[8.1721] → [8.1721:1755]

                    command_text,

[8.1721]

[8.1755]

                    &command_text,

Replacement in src/opt.rs at line 249 [4.5920]

∅:D[11.785] → [12.1867:1881]

∅:D[8.1888] → [12.1867:1881]

B:BD[12.1867] → [12.1867:1881]

∅:D[11.1060] → [12.2272:2282]

B:BD[12.2272] → [12.2272:2282]

            }
        }

[8.1888]

[4.12238]

            },
            |sub_command| match sub_command {
                SubCommand::ZSHAddHistory(o) => {
                    run::zsh_add_history(o.command, o.socket_path.socket_path)
                }
                SubCommand::Server(o) => run::server(
                    o.cache_path,
                    &o.socket_path.socket_path,
                    o.data_dir.data_dir,
                ),
                SubCommand::Stop(o) => run::stop(o.socket_path),
                SubCommand::PreCmd(o) => run::precmd(o.socket_path),
                SubCommand::SessionID => run::session_id(),
                SubCommand::Running(o) => run::running(o.socket_path),
                SubCommand::Import(o) => run::import(&o.import_file, o.data_dir.data_dir),
            },
        )

Replacement in src/run.rs at line 35 [8.1890]
B:BD[8.2360] → [8.2360:2400]
```
    ClientError(#[from] client::Error),
```
[8.2360]
[8.2400]
```
    Client(#[from] client::Error),
```
Replacement in src/run.rs at line 38 [8.1890]
B:BD[8.2421] → [8.2421:2463]
```
    MessageError(#[from] message::Error),
```
[8.2421]
[8.2463]
```
    Message(#[from] message::Error),
```
Replacement in src/run.rs at line 41 [8.1890]
B:BD[8.2484] → [8.2484:2524]
```
    ServerError(#[from] server::Error),
```
[8.2484]
[8.2524]
```
    Server(#[from] server::Error),
```
Replacement in src/run.rs at line 44 [8.1890]
B:BD[8.2545] → [8.2545:2583]
```
    StoreError(#[from] store::Error),
```
[8.2545]
[8.2583]
```
    Store(#[from] store::Error),
```

Insertion in src/run.rs at line 74 [8.1890]

[8.3425]

#[allow(clippy::fn_params_excessive_bools)]
#[allow(clippy::too_many_arguments)]

Replacement in src/run.rs at line 83 [8.1890]
B:BD[8.3592] → [8.3592:3621]
```
    command: Option<String>,
```
[8.3592]
[8.3621]
```
    command: &Option<String>,
```
Replacement in src/run.rs at line 85 [8.1890]
B:BD[8.3643] → [8.3643:3676]
```
    command_text: Option<Regex>,
```
[8.3643]
[8.3676]
```
    command_text: &Option<Regex>,
```
Replacement in src/run.rs at line 111 [8.1890]
B:BD[8.4275] → [2.130:148]
```
        &command,
```
[8.4275]
[2.148]
```
        command,
```
Replacement in src/run.rs at line 114 [8.1890]
B:BD[8.4332] → [2.170:193]
```
        &command_text,
```
[8.4332]
[8.4354]
```
        command_text,
```
Replacement in src/run.rs at line 144 [8.1890]
B:BD[8.5168] → [8.5168:5207]
```
    for entry in entries.into_iter() {
```
[8.5168]
[8.5207]
```
    for entry in entries {
```

Replacement in src/run.rs at line 160 [8.1890]

B:BD[8.5582] → [8.5582:5684]

        row.push(format_pwd(entry.pwd)?);
        row.push(format_command(entry.command, no_format));

[8.5582]

[8.5684]

        row.push(format_pwd(&entry.pwd)?);
        row.push(format_command(&entry.command, no_format));

Replacement in src/run.rs at line 174 [8.1890]

B:BD[8.5897] → [8.5897:5962]

    client::new(socket_path).send(Message::CommandStart(data))?;

[8.5897]

[8.5962]

    client::new(socket_path).send(&Message::CommandStart(data))?;

Replacement in src/run.rs at line 179 [8.1890]

B:BD[8.5977] → [8.5977:6076]

pub fn server(cache_path: PathBuf, socket_path: PathBuf, data_dir: PathBuf) -> Result<(), Error> {

[8.5977]

[8.6076]

pub fn server(cache_path: PathBuf, socket_path: &PathBuf, data_dir: PathBuf) -> Result<(), Error> {

Replacement in src/run.rs at line 182 [8.1890]
B:BD[8.6130] → [2.194:227]
```
    server.start(&socket_path)?;
```
[8.6130]
[8.6162]
```
    server.start(socket_path)?;
```

Replacement in src/run.rs at line 188 [8.1890]

B:BD[8.6234] → [8.6234:6285]

    client::new(socket_path).send(Message::Stop)?;

[8.6234]

[8.6285]

    client::new(socket_path).send(&Message::Stop)?;

Replacement in src/run.rs at line 196 [8.1890]

B:BD[8.6405] → [8.6405:6473]

    client::new(socket_path).send(Message::CommandFinished(data))?;

[8.6405]

[8.6473]

    client::new(socket_path).send(&Message::CommandFinished(data))?;

Replacement in src/run.rs at line 208 [8.1890]

B:BD[8.6642] → [8.6642:6696]

    client::new(socket_path).send(Message::Running)?;

[8.6642]

[8.6696]

    client::new(socket_path).send(&Message::Running)?;

Deletion in src/run.rs at line 212 [8.1890]

B:BD[8.6710] → [8.6710:7118]


pub fn import(import_file: PathBuf, data_dir: PathBuf) -> Result<(), Error> {
    let db = rusqlite::Connection::open(&import_file).map_err(Error::OpenSqliteDatabase)?;
    let mut stmt = db
        .prepare(
            "select * from history left join places on places.id=history.place_id
    left join commands on history.command_id=commands.id",
        )
        .map_err(Error::PrepareSqliteQuery)?;

Insertion in src/run.rs at line 213 [8.1890]

[8.7119]

pub fn import(import_file: &PathBuf, data_dir: PathBuf) -> Result<(), Error> {

Insertion in src/run.rs at line 224 [8.1890]

[8.7383]


    let db = rusqlite::Connection::open(&import_file).map_err(Error::OpenSqliteDatabase)?;

Insertion in src/run.rs at line 227 [8.1890]

[8.7384]

    let mut stmt = db
        .prepare(
            "select * from history left join places on places.id=history.place_id
    left join commands on history.command_id=commands.id",
        )
        .map_err(Error::PrepareSqliteQuery)?;

Replacement in src/run.rs at line 341 [8.1890]

B:BD[8.10386] → [8.10386:10441]

fn format_pwd(pwd: PathBuf) -> Result<String, Error> {

[8.10386]

[8.10441]

fn format_pwd(pwd: &PathBuf) -> Result<String, Error> {

Replacement in src/run.rs at line 372 [8.1890]

B:BD[8.11335] → [8.11335:11399]

fn format_command(command: String, no_format: bool) -> String {

[8.11335]

[8.11399]

fn format_command(command: &str, no_format: bool) -> String {

Replacement in src/server.rs at line 153 [6.10542]

B:BD[3.9062] → [3.9062:9137]

            Message::CommandFinished(data) => self.command_finished(data),

[3.9062]

[13.1852]

            Message::CommandFinished(data) => self.command_finished(&data),

Replacement in src/server.rs at line 159 [6.10542]
∅:D[3.9220] → [6.11266:11311]
B:BD[6.11266] → [6.11266:11311]
```
        let mut buffer = [0u8; BUFFER_SIZE];
```
[3.9220]
[5.2963]
```
        let mut buffer = [0_u8; BUFFER_SIZE];
```

Replacement in src/server.rs at line 180 [6.10542]

B:BD[3.9606] → [13.2024:2113]

    fn command_finished(&mut self, finish: CommandFinished) -> Result<RunState, Error> {

[3.9606]

[3.9689]

    fn command_finished(&mut self, finish: &CommandFinished) -> Result<RunState, Error> {