chore: Make return types more flexible

Signed-off-by: Dmitry Dygalo <[email protected]>

Author: Stranger6667

CHANGELOG.md

@@ -18,6 +18,8 @@
 ### Changed
 
 - Make `Debug` implementation for `SchemaNode` opaque.
+- Make `jsonschema::validator_for` and related functions return `ValidationError<'static>` in their `Err` variant.
+  This change makes possible to use the `?` operator to return errors from functions where the input schema is defined.
 
 ### Deprecated
 

README.md

@@ -19,8 +19,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     assert!(jsonschema::is_valid(&schema, &instance));
 
     // Build & reuse (faster)
-    let validator = jsonschema::validator_for(&schema)
-        .expect("Invalid schema");
+    let validator = jsonschema::validator_for(&schema)?;
 
     // Iterate over errors
     if let Err(errors) = validator.validate(&instance) {

crates/jsonschema/src/compilation/mod.rs

@@ -65,14 +65,14 @@ impl Validator {
         ValidationOptions::default()
     }
     /// Create a validator using the default options.
-    pub fn new(schema: &Value) -> Result<Validator, ValidationError> {
+    pub fn new(schema: &Value) -> Result<Validator, ValidationError<'static>> {
         Self::options().build(schema)
     }
     /// Create a validator using the default options.
     ///
     /// **DEPRECATED**: Use [`Validator::new`] instead.
     #[deprecated(since = "0.20.0", note = "Use `Validator::new` instead")]
-    pub fn compile(schema: &Value) -> Result<Validator, ValidationError> {
+    pub fn compile(schema: &Value) -> Result<Validator, ValidationError<'static>> {
         Self::new(schema)
     }
     /// Run validation against `instance` and return an iterator over [`ValidationError`] in the error case.

crates/jsonschema/src/compilation/options.rs

@@ -309,10 +309,7 @@ impl ValidationOptions {
     /// assert!(validator.is_valid(&json!("Hello")));
     /// assert!(!validator.is_valid(&json!(42)));
     /// ```
-    pub fn build<'a>(
-        &self,
-        schema: &'a serde_json::Value,
-    ) -> Result<Validator, ValidationError<'a>> {
+    pub fn build(&self, schema: &serde_json::Value) -> Result<Validator, ValidationError<'static>> {
         // Draft is detected in the following precedence order:
         //   - Explicitly specified;
         //   - $schema field in the document;
@@ -348,11 +345,14 @@ impl ValidationOptions {
                 .validate(schema)
                 .err()
             {
-                return Err(errors.next().expect("Should have at least one element"));
+                return Err(errors
+                    .next()
+                    .expect("Should have at least one element")
+                    .into_owned());
             }
         }
 
-        let node = compile_validators(schema, &context)?;
+        let node = compile_validators(schema, &context).map_err(|err| err.into_owned())?;
 
         Ok(Validator { node, config })
     }