Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-01 14:10:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Extract string_to_value to its own function

Browse Source
This commit is contained in:
Nixon Enraght-Moony
2021-02-21 20:10:57 +00:00
parent a22d948eb0
commit ba22a69d96
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/jsondocck/src/main.rs
+13 -17
View File
@@ -2,6 +2,7 @@
use lazy_static::lazy_static;
use regex::{Regex, RegexBuilder};
use serde_json::Value;
use std::borrow::Cow;
use std::{env, fmt, fs};
mod cache;
@@ -207,15 +208,8 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
let val = cache.get_value(&command.args[0])?;
match select(&val, &command.args[1]) {
Ok(results) => {
// FIXME: Share the pat getting code with the `Is` branch.
let v_holder;
let pat: &Value = if command.args[2].starts_with("$") {
&cache.variables[&command.args[2][1..]]
} else {
v_holder = serde_json::from_str(&command.args[2]).unwrap();
&v_holder
};
results.contains(pat)
let pat = string_to_value(&command.args[2], cache);
results.contains(&pat.as_ref())
}
Err(_) => false,
}
@@ -240,14 +234,8 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
let val = cache.get_value(&command.args[0])?;
match select(&val, &command.args[1]) {
Ok(results) => {
let v_holder;
let pat: &Value = if command.args[2].starts_with("$") {
&cache.variables[&command.args[2][1..]]
} else {
v_holder = serde_json::from_str(&command.args[2]).unwrap();
&v_holder
};
results.len() == 1 && results[0] == pat
let pat = string_to_value(&command.args[2], cache);
results.len() == 1 && results[0] == pat.as_ref()
}
Err(_) => false,
}
@@ -296,3 +284,11 @@ fn check_command(command: Command, cache: &mut Cache) -> Result<(), CkError> {
Ok(())
}
}
fn string_to_value<'a>(s: &str, cache: &'a Cache) -> Cow<'a, Value> {
if s.starts_with("$") {
Cow::Borrowed(&cache.variables[&s[1..]])
} else {
Cow::Owned(serde_json::from_str(s).unwrap())
}
}