ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump cargo to 1.88; 2024 edition for kcl-lib (#7618)

Browse Source 
This is a big one because the edition changes a fair number of things.
This commit is contained in:
Adam Chalmers
2025-06-26 17:02:54 -05:00
committed by GitHub
parent 6a2027cd51
commit 4356885aa2
100 changed files with 769 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rust/kcl-lib/src/settings/generate_settings_docs.rs
View File

@ -1,9 +1,9 @@
use std::path::PathBuf;
use schemars::{gen::SchemaGenerator, JsonSchema};
use serde_json::{json, Value};
use schemars::{JsonSchema, r#gen::SchemaGenerator};
use serde_json::{Value, json};
use crate::settings::types::{project::ProjectConfiguration, Configuration};
use crate::settings::types::{Configuration, project::ProjectConfiguration};
// Project settings example in TOML format
const PROJECT_SETTINGS_EXAMPLE: &str = r#"[settings.app]
@ -60,7 +60,7 @@ fn init_handlebars() -> handlebars::Handlebars<'static> {
let pretty_options = array
.iter()
.filter_map(|v| v.as_str())
.map(|s| format!("`{}`", s))
.map(|s| format!("`{s}`"))
.collect::<Vec<_>>()
.join(", ");
out.write(&pretty_options)?;
@ -89,17 +89,17 @@ fn init_handlebars() -> handlebars::Handlebars<'static> {
Value::Null => out.write("None")?,
Value::Bool(b) => out.write(&b.to_string())?,
Value::Number(n) => out.write(&n.to_string())?,
Value::String(s) => out.write(&format!("`{}`", s))?,
Value::String(s) => out.write(&format!("`{s}`"))?,
Value::Array(arr) => {
let formatted = arr
.iter()
.map(|v| match v {
Value::String(s) => format!("`{}`", s),
_ => format!("{}", v),
Value::String(s) => format!("`{s}`"),
_ => format!("{v}"),
})
.collect::<Vec<_>>()
.join(", ");
out.write(&format!("[{}]", formatted))?;
out.write(&format!("[{formatted}]"))?;
}
Value::Object(_) => out.write("(complex default)")?,
}
@ -122,7 +122,7 @@ pub fn generate_settings_docs() {
let hbs = init_handlebars();
// Generate project settings documentation
let mut settings = schemars::gen::SchemaSettings::default();
let mut settings = schemars::r#gen::SchemaSettings::default();
settings.inline_subschemas = true;
settings.meta_schema = None; // We don't need the meta schema for docs
settings.option_nullable = false; // Important - makes Option fields show properly