Skip to content
Merged
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
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.82.0"
channel = "1.88.0"
components = ["clippy", "rustfmt"]
31 changes: 27 additions & 4 deletions src/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ impl<'a> From<Value<'a>> for serde_json::Value {
}
Value::BooleanLit(b) => serde_json::Value::Bool(b.value),
Value::NullKeyword(_) => serde_json::Value::Null,
Value::NumberLit(num) => {
let number = serde_json::Number::from_str(num.value).expect("could not parse number");
serde_json::Value::Number(number)
}
Value::NumberLit(num) => match serde_json::Number::from_str(num.value) {
Ok(number) => serde_json::Value::Number(number),
Err(_) => serde_json::Value::String(num.value.to_string()),
},
Value::Object(obj) => {
let mut map = serde_json::map::Map::new();
for prop in obj.properties {
Expand Down Expand Up @@ -633,4 +633,27 @@ mod test {
})
);
}

#[cfg(feature = "serde")]
#[test]
fn handle_weird_data() {
let ast = parse_to_ast(
r#"{eyyyyyyy:6yy:6000e000615yyyk:6}"#,
&Default::default(),
&ParseOptions::default(),
)
.unwrap();
let value = ast.value.unwrap();
let serde_value: serde_json::Value = value.into();

assert_eq!(
serde_value,
// this output is fine because the input is bad
serde_json::json!({
"eyyyyyyy": 6,
"yy": "6000e000615",
"yyyk": 6
})
);
}
}
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#![deny(clippy::print_stderr)]
#![deny(clippy::print_stdout)]
#![allow(clippy::uninlined_format_args)]

pub mod ast;
pub mod common;
Expand Down
2 changes: 1 addition & 1 deletion src/parse_to_ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ fn parse_value<'a>(context: &mut Context<'a>) -> Result<Option<Value<'a>>, Parse
Token::String(value) => Ok(Some(Value::StringLit(create_string_lit(context, value)))),
Token::Boolean(value) => Ok(Some(Value::BooleanLit(create_boolean_lit(context, value)))),
Token::Number(value) => Ok(Some(Value::NumberLit(create_number_lit(context, value)))),
Token::Null => return Ok(Some(Value::NullKeyword(create_null_keyword(context)))),
Token::Null => Ok(Some(Value::NullKeyword(create_null_keyword(context)))),
Token::CloseBracket => Err(context.create_error(ParseErrorKind::UnexpectedCloseBracket)),
Token::CloseBrace => Err(context.create_error(ParseErrorKind::UnexpectedCloseBrace)),
Token::Comma => Err(context.create_error(ParseErrorKind::UnexpectedComma)),
Expand Down
Loading