summaryrefslogtreecommitdiff
path: root/cli/lsp/registries.rs
diff options
context:
space:
mode:
authorYusuke Tanaka <yusuktan@maguro.dev>2021-07-30 22:03:41 +0900
committerGitHub <noreply@github.com>2021-07-30 15:03:41 +0200
commit8f00b5542caffd14988b923efe4f066b712d2858 (patch)
treee56ebefb0b73a2205bc482a0a6f55e87bd35a92b /cli/lsp/registries.rs
parentc909faf9e6cd2964398da7c0852d0229cdd1a22b (diff)
chore: upgrade Rust to 1.54.0 (#11554)
Diffstat (limited to 'cli/lsp/registries.rs')
-rw-r--r--cli/lsp/registries.rs15
1 files changed, 7 insertions, 8 deletions
diff --git a/cli/lsp/registries.rs b/cli/lsp/registries.rs
index d044927bc..6a1dc1a4b 100644
--- a/cli/lsp/registries.rs
+++ b/cli/lsp/registries.rs
@@ -104,7 +104,7 @@ fn get_completor_type(
if let StringOrNumber::String(name) = &k.name {
let value = match_result
.get(name)
- .map(|s| s.to_string(Some(&k)))
+ .map(|s| s.to_string(Some(k)))
.unwrap_or_default();
len += value.chars().count();
if offset <= len {
@@ -183,14 +183,13 @@ fn validate_config(config: &RegistryConfigurationJson) -> Result<(), AnyError> {
.collect()
});
- let variable_names: Vec<String> = registry
- .variables
- .iter()
- .map(|var| var.key.to_owned())
- .collect();
-
for key_name in &key_names {
- if !variable_names.contains(key_name) {
+ if !registry
+ .variables
+ .iter()
+ .map(|var| var.key.to_owned())
+ .any(|x| x == *key_name)
+ {
return Err(anyhow!("Invalid registry configuration. Registry with schema \"{}\" is missing variable declaration for key \"{}\".", registry.schema, key_name));
}
}