Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions typify-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,19 @@ fn do_import_types(item: TokenStream) -> Result<TokenStream, syn::Error> {

let path = dir.join(schema.value());

let root_schema: schemars::schema::RootSchema =
serde_json::from_reader(std::fs::File::open(&path).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't read file {}: {}", schema.value(), e),
)
})?)
.unwrap();
let file = std::fs::File::open(&path).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't read file {}: {}", schema.value(), e),
)
})?;

let root_schema: schemars::schema::RootSchema = serde_json::from_reader(file).map_err(|e| {
syn::Error::new(
schema.span(),
format!("couldn't parse file {}: {}", schema.value(), e),
)
})?;

let mut type_space = TypeSpace::new(&settings);
type_space
Expand Down
6 changes: 6 additions & 0 deletions typify/tests/compile-fail/malformed-schema.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
use typify::import_types;

// Cargo.toml exists in trybuild's generated crate but is not valid JSON.
import_types!("Cargo.toml");

fn main() {}
5 changes: 5 additions & 0 deletions typify/tests/compile-fail/malformed-schema.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
error: couldn't parse file Cargo.toml: invalid type: sequence, expected struct RootSchema at line 1 column 1
--> tests/compile-fail/malformed-schema.rs:4:15
|
4 | import_types!("Cargo.toml");
| ^^^^^^^^^^^^
6 changes: 6 additions & 0 deletions typify/tests/compile_fail.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2026 Oxide Computer Company

#[test]
fn test_compile_fail() {
trybuild::TestCases::new().compile_fail("tests/compile-fail/*.rs");
}