zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-21 18:10:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

MAINT: cargo fmt

Browse Source
This commit is contained in:
Jeremy Wall 2019-10-02 20:56:09 -05:00
parent acfd343c7a
commit acffc6d5da
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/build_main.rs
View File

@ -20,7 +20,12 @@ fn generate_rust_module() -> String {
let fixed_path_str = path_str.replace(std::path::MAIN_SEPARATOR, "/"); let fixed_path_str = path_str.replace(std::path::MAIN_SEPARATOR, "/");
if path.is_file() && !path_str.ends_with("_test.ucg") { if path.is_file() && !path_str.ends_with("_test.ucg") {
println!("Adding lib file: {}", path_str); println!("Adding lib file: {}", path_str);
let out_path = PathBuf::from(format!("{}{}{}", out_dir, std::path::MAIN_SEPARATOR, path_str)); let out_path = PathBuf::from(format!(
"{}{}{}",
out_dir,
std::path::MAIN_SEPARATOR,
path_str
));
// We have to copy the file into out out directory to ensure that we // We have to copy the file into out out directory to ensure that we
// have a reliable way for the stdlib.rs module file to include them // have a reliable way for the stdlib.rs module file to include them
// from. // from.
@ -28,7 +33,10 @@ fn generate_rust_module() -> String {
std::fs::copy(&path_str, &out_path).unwrap(); std::fs::copy(&path_str, &out_path).unwrap();
let include = format!( let include = format!(
"\tstdlib.insert(\n\t\tr\"{}\".to_string(),\n\t\tinclude_str!(r\"{}{}{}\"));\n", "\tstdlib.insert(\n\t\tr\"{}\".to_string(),\n\t\tinclude_str!(r\"{}{}{}\"));\n",
fixed_path_str, out_dir, std::path::MAIN_SEPARATOR, path_str fixed_path_str,
out_dir,
std::path::MAIN_SEPARATOR,
path_str
); );
rust_lib.push_str(&include); rust_lib.push_str(&include);
rust_lib.push_str("\n"); rust_lib.push_str("\n");

20
src/convert/yaml.rs
View File

@ -124,16 +124,16 @@ impl YamlConverter {
serde_yaml::Value::Mapping(m) => { serde_yaml::Value::Mapping(m) => {
let mut fs = Vec::with_capacity(m.len()); let mut fs = Vec::with_capacity(m.len());
self.merge_mapping_keys(&mut fs, m)?; self.merge_mapping_keys(&mut fs, m)?;
fs.reverse(); fs.reverse();
let mut seen_keys = BTreeSet::new(); let mut seen_keys = BTreeSet::new();
let mut collapsed = Vec::with_capacity(fs.len()); let mut collapsed = Vec::with_capacity(fs.len());
for (k, val) in fs { for (k, val) in fs {
if !seen_keys.contains(&k) { if !seen_keys.contains(&k) {
collapsed.push((k.clone(), val)); collapsed.push((k.clone(), val));
seen_keys.insert(k); seen_keys.insert(k);
} }
} }
collapsed.reverse(); collapsed.reverse();
Val::Tuple(collapsed) Val::Tuple(collapsed)
} }
}) })