extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add general refactorings (#3996)

Browse Source
This commit is contained in:
Marcin Puc
2021-09-10 00:44:22 +02:00
committed by GitHub
parent ae9f4135c0
commit 51c74eebd0
165 changed files with 540 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-completion/src/command.rs
View File

@ -25,7 +25,7 @@ where
let path_executables = find_path_executables().unwrap_or_default();
// TODO quote these, if necessary
commands.extend(path_executables.into_iter());
commands.extend(path_executables);
let mut suggestions: Vec<_> = commands
.into_iter()

2
crates/nu-completion/src/completer.rs
View File

@ -37,7 +37,7 @@ impl NuCompleter {
.and_then(|cfg| cfg.get("line_editor").cloned())
.and_then(|le| {
le.row_entries()
.find(|(idx, _value)| idx.as_str() == "completion_match_method")
.find(|&(idx, _value)| idx == "completion_match_method")
.and_then(|(_idx, value)| value.as_string().ok())
})
.unwrap_or_else(String::new);

2
crates/nu-completion/src/engine.rs
View File

@ -306,7 +306,7 @@ mod tests {
}
fn get_signature(&self, name: &str) -> Option<nu_protocol::Signature> {
self.0.iter().find(|v| v.name == name).map(Clone::clone)
self.0.iter().find(|v| v.name == name).cloned()
}
fn get_alias(&self, _name: &str) -> Option<Vec<Spanned<String>>> {

2
crates/nu-completion/src/flag.rs
View File

@ -12,7 +12,7 @@ where
fn complete(&self, ctx: &Context, partial: &str, matcher: &dyn Matcher) -> Vec<Suggestion> {
if let Some(sig) = ctx.signature_registry().get(&self.cmd) {
let mut suggestions = Vec::new();
for (name, (named_type, _desc)) in sig.named.iter() {
for (name, (named_type, _desc)) in &sig.named {
suggestions.push(format!("--{}", name));
if let Some(c) = named_type.get_short() {

2
crates/nu-completion/src/matchers/case_insensitive.rs
View File

@ -5,7 +5,7 @@ pub struct Matcher;
impl matchers::Matcher for Matcher {
fn matches(&self, partial: &str, from: &str) -> bool {
from.to_ascii_lowercase()
.starts_with(partial.to_ascii_lowercase().as_str())
.starts_with(&partial.to_ascii_lowercase())
}
}

4
crates/nu-completion/src/path.rs
View File

@ -39,8 +39,8 @@ impl PathCompleter {
.filter_map(|entry| {
entry.ok().and_then(|entry| {
let mut file_name = entry.file_name().to_string_lossy().into_owned();
if matcher.matches(partial, file_name.as_str()) {
let mut path = format!("{}{}", &base_dir_name, file_name);
if matcher.matches(partial, &file_name) {
let mut path = format!("{}{}", base_dir_name, file_name);
if entry.path().is_dir() {
path.push(SEP);
file_name.push(SEP);