mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 12:47:05 +00:00
merge conflicts
This commit is contained in:
@@ -42,6 +42,6 @@ types = { workspace = true }
|
||||
|
||||
[dev-dependencies]
|
||||
operation_pool = { workspace = true }
|
||||
serde_yaml = { workspace = true }
|
||||
state_processing = { workspace = true }
|
||||
tokio = { workspace = true }
|
||||
yaml_serde = { workspace = true }
|
||||
|
||||
@@ -236,7 +236,7 @@ mod tests {
|
||||
fn serde() {
|
||||
let config = Config::default();
|
||||
let serialized =
|
||||
serde_yaml::to_string(&config).expect("should serde encode default config");
|
||||
serde_yaml::from_str::<Config>(&serialized).expect("should serde decode default config");
|
||||
yaml_serde::to_string(&config).expect("should serde encode default config");
|
||||
yaml_serde::from_str::<Config>(&serialized).expect("should serde decode default config");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user