Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fasterthanlime committed Oct 6, 2024
1 parent 052fdef commit 8b2811d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ check:
#!/bin/bash -eux
cargo check --example simple --no-default-features --features=json
cargo run --example simple --features=core,json
cargo hack --feature-powerset --exclude-features=default,full check -p merde
cargo hack --each-feature --exclude-features=default,full check -p merde
cargo test -F full

pushd zerodeps-example
Expand Down
2 changes: 2 additions & 0 deletions merde/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@ full = [
"time",
"rusqlite",
"compact_str",
"compact_bytes",
]
core = ["dep:merde_core"]
deserialize = ["core"]
# merde_core re-exports
compact_str = ["merde_core/compact_str"]
compact_bytes = ["merde_core/compact_bytes"]
serde = ["merde_core/serde"]
rusqlite = ["merde_core/rusqlite"]

Expand Down
2 changes: 1 addition & 1 deletion merde_core/src/cowbytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ impl<'a> From<Vec<u8>> for CowBytes<'a> {
fn from(v: Vec<u8>) -> Self {
#[cfg(feature = "compact_bytes")]
{
CowBytes::Owned(CompactBytes::new(v))
CowBytes::Owned(CompactBytes::from(v))
}
#[cfg(not(feature = "compact_bytes"))]
{
Expand Down
10 changes: 9 additions & 1 deletion merde_core/src/deserialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,15 @@ impl<'s, T: Deserialize<'s>> Deserialize<'s> for Vec<T> {

loop {
match de.next()? {
Event::ArrayEnd => break,
Event::ArrayEnd => {
#[cfg(debug_assertions)]
{
println!("Stack trace:");
let backtrace = std::backtrace::Backtrace::capture();
println!("{}", backtrace);
}
break;
}
ev => {
let item: T = de.t_starting_with(Some(ev)).await?;
vec.push(item);
Expand Down
9 changes: 9 additions & 0 deletions merde_json/src/deserialize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ impl<'s> Deserializer<'s> for JsonDeserializer<'s> {
return Ok(ev);
}

eprintln!("stack first: {:?}", self.stack.first());
// Print native code backtrace
println!("Native Code Backtrace:");
let backtrace = std::backtrace::Backtrace::capture();
println!("{}", backtrace);

let peek: Option<Peek> = match self.stack.pop() {
Some(StackItem::ObjectKey(maybe_key)) => match maybe_key {
Some(key) => {
Expand Down Expand Up @@ -309,6 +315,9 @@ mod tests {
]
);

let deser = JsonDeserializer::new(input);
let mut deser = LoggingDeserializer::new(deser);

let value = deser.deserialize::<merde_core::Value>().unwrap();
eprintln!("value = {:#?}", value);

Expand Down

0 comments on commit 8b2811d

Please sign in to comment.