Fix rebase fails
This commit is contained in:
parent
b60a98bd6e
commit
9ed953e8c3
|
@ -78,7 +78,7 @@ fn main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("Parsing stdin...");
|
println!("Parsing stdin...");
|
||||||
let demo: MintDemo = serde_json::from_reader(stdin()).unwrap_or_else(|e| {
|
let demo: MintDemo = serde_json::from_str(&buffer).unwrap_or_else(|e| {
|
||||||
eprintln!("failed to parse json: {}", e);
|
eprintln!("failed to parse json: {}", e);
|
||||||
exit(1);
|
exit(1);
|
||||||
});
|
});
|
||||||
|
|
|
@ -31,7 +31,7 @@ fn main() {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let demo: MintDemo = serde_json::from_reader(stdin()).unwrap_or_else(|e| {
|
let demo: MintDemo = serde_json::from_str(&buffer).unwrap_or_else(|e| {
|
||||||
eprintln!("failed to parse json: {}", e);
|
eprintln!("failed to parse json: {}", e);
|
||||||
exit(1);
|
exit(1);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue