Skip to content

Commit

Permalink
clippy & fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
LoricAndre committed Nov 8, 2024
1 parent 27cf063 commit e21b227
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 15 deletions.
17 changes: 10 additions & 7 deletions skim/examples/custom_keybinding_actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ pub fn main() {
.build()
.unwrap();

Skim::run_with(&options, None).map(|out| match out.final_key {
// Delete each selected item
Key::Backspace => out.selected_items.iter().for_each(|i| fake_delete_item(&i.text())),
// Create a new item based on the query
Key::Enter => fake_create_item(out.query.as_ref()),
_ => (),
});
if let Some(out) = Skim::run_with(&options, None) {
match out.final_key {
// Delete each selected item
Key::Backspace => out.selected_items.iter().for_each(|i| fake_delete_item(&i.text())),
// Create a new item based on the query
Key::Enter => fake_create_item(out.query.as_ref()),

_ => (),
}
};
}
5 changes: 4 additions & 1 deletion skim/examples/nth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ use std::io::Cursor;
pub fn main() {
let input = "foo 123";

let options = SkimOptionsBuilder::default().query(Some(String::from("f"))).build().unwrap();
let options = SkimOptionsBuilder::default()
.query(Some(String::from("f")))
.build()
.unwrap();
let item_reader = SkimItemReader::new(SkimItemReaderOption::default().nth(vec!["2"].into_iter()).build());

let items = item_reader.of_bufread(Cursor::new(input));
Expand Down
4 changes: 2 additions & 2 deletions skim/src/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ extern crate shlex;
extern crate skim;
extern crate time;

use self::context::SkimContext;
use self::reader::CommandCollector;
use clap::Parser;
use derive_builder::Builder;
use self::reader::CommandCollector;
use self::context::SkimContext;
use std::fs::File;
use std::io::{BufReader, BufWriter, IsTerminal, Write};
use std::{env, io};
Expand Down
2 changes: 1 addition & 1 deletion skim/src/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl Header {
Some(header) => {
let mut parser = ANSIParser::default();
if !header.is_empty() {
self.header = str_lines(&header).into_iter().map(|l| parser.parse_ansi(l)).collect();
self.header = str_lines(header).into_iter().map(|l| parser.parse_ansi(l)).collect();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion skim/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub use crate::output::SkimOutput;
use crate::reader::Reader;

mod ansi;
pub mod context;
mod engine;
mod event;
pub mod field;
Expand All @@ -44,7 +45,6 @@ mod selection;
mod spinlock;
mod theme;
mod util;
pub mod context;

//------------------------------------------------------------------------------
pub trait AsAny {
Expand Down
6 changes: 3 additions & 3 deletions skim/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl Query {
self
}

fn parse_options(&mut self, options: &SkimOptions) -> std::io::Result<()>{
fn parse_options(&mut self, options: &SkimOptions) -> std::io::Result<()> {
// some options accept multiple values, thus take the last one

if let Some(base_cmd) = &options.cmd {
Expand All @@ -125,11 +125,11 @@ impl Query {
self.cmd_prompt = options.cmd_prompt.clone();

if let Some(filename) = &options.history {
self.fz_query_history_before = read_file_lines(&filename)?;
self.fz_query_history_before = read_file_lines(filename)?;
}

if let Some(filename) = &options.cmd_history {
self.cmd_history_before = read_file_lines(&filename)?;
self.cmd_history_before = read_file_lines(filename)?;
}
Ok(())
}
Expand Down

0 comments on commit e21b227

Please sign in to comment.