VienDesu/schemars
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove usages of gen identifier (#323)

Browse source 
`gen` is a reserved keyword in rust 2024, making it very awkward to use as a module/variable name.
This commit is contained in:
Graham Esau 2024-08-21 16:15:13 +01:00 • committed by GitHub
parent 8142be1ea2
commit b4f214f6dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
42 changed files with 186 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

2
schemars/tests/docs.rs
View file

@ -1,5 +1,5 @@
mod util;
use schemars::{gen::SchemaSettings, JsonSchema};
use schemars::{generate::SchemaSettings, JsonSchema};
use util::*;
#[allow(dead_code)]

18
schemars/tests/from_value.rs
View file

@ -1,5 +1,5 @@
mod util;
use schemars::gen::{SchemaGenerator, SchemaSettings};
use schemars::generate::{SchemaGenerator, SchemaSettings};
use serde::Serialize;
use std::collections::HashMap;
use util::*;
@ -53,32 +53,32 @@ fn make_value() -> MyStruct {
#[test]
fn schema_from_value_matches_draft07() -> TestResult {
let gen = SchemaSettings::draft07().into_generator();
let actual = gen.into_root_schema_for_value(&make_value())?;
let generator = SchemaSettings::draft07().into_generator();
let actual = generator.into_root_schema_for_value(&make_value())?;
test_schema(&actual, "from_value_draft07")
}
#[test]
fn schema_from_value_matches_2019_09() -> TestResult {
let gen = SchemaSettings::draft2019_09().into_generator();
let actual = gen.into_root_schema_for_value(&make_value())?;
let generator = SchemaSettings::draft2019_09().into_generator();
let actual = generator.into_root_schema_for_value(&make_value())?;
test_schema(&actual, "from_value_2019_09")
}
#[test]
fn schema_from_value_matches_openapi3() -> TestResult {
let gen = SchemaSettings::openapi3().into_generator();
let actual = gen.into_root_schema_for_value(&make_value())?;
let generator = SchemaSettings::openapi3().into_generator();
let actual = generator.into_root_schema_for_value(&make_value())?;
test_schema(&actual, "from_value_openapi3")
}
#[test]
fn schema_from_json_value() -> TestResult {
let gen = SchemaGenerator::default();
let actual = gen.into_root_schema_for_value(&serde_json::json!({
let generator = SchemaGenerator::default();
let actual = generator.into_root_schema_for_value(&serde_json::json!({
"zero": 0,
"one": 1,
"minusOne": -1,

2
schemars/tests/inline_subschemas.rs
View file

@ -1,5 +1,5 @@
mod util;
use schemars::gen::SchemaSettings;
use schemars::generate::SchemaSettings;
use schemars::JsonSchema;
use util::*;

2
schemars/tests/schema_settings.rs
View file

@ -1,5 +1,5 @@
mod util;
use schemars::gen::SchemaSettings;
use schemars::generate::SchemaSettings;
use schemars::{JsonSchema, Schema};
use serde_json::Value;
use std::collections::BTreeMap;

4
schemars/tests/schema_with_enum.rs
View file

@ -2,8 +2,8 @@ mod util;
use schemars::JsonSchema;
use util::*;
fn schema_fn(gen: &mut schemars::SchemaGenerator) -> schemars::Schema {
<bool>::json_schema(gen)
fn schema_fn(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
<bool>::json_schema(generator)
}
#[derive(Debug)]

4
schemars/tests/schema_with_struct.rs
View file

@ -2,8 +2,8 @@ mod util;
use schemars::JsonSchema;
use util::*;
fn schema_fn(gen: &mut schemars::SchemaGenerator) -> schemars::Schema {
<bool>::json_schema(gen)
fn schema_fn(generator: &mut schemars::SchemaGenerator) -> schemars::Schema {
<bool>::json_schema(generator)
}
struct DoesntImplementJsonSchema;

2
schemars/tests/util/mod.rs
View file

@ -1,5 +1,5 @@
use pretty_assertions::assert_eq;
use schemars::{gen::SchemaSettings, schema_for, JsonSchema, Schema};
use schemars::{generate::SchemaSettings, schema_for, JsonSchema, Schema};
use std::error::Error;
use std::format;
use std::fs;