Skip to content

Commit ce096c4

Browse files
author
vxfemboy
committed
Resolve merge conflicts in post_quantum.rs and compression_benchmarks.rs
- Fixed formatting conflict in post_quantum.rs (chose multi-line formatting) - Fixed formatting conflict in compression_benchmarks.rs (chose multi-line formatting for consistency) - Both files now have consistent, readable formatting *purrs proudly*
2 parents 322a342 + 04b8960 commit ce096c4

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

benches/compression_benchmarks.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ fn bench_compression_quality(c: &mut Criterion) {
8989
.into_iter()
9090
.collect::<Vec<u8>>(),
9191
),
92-
("repeated_patterns", [0x41u8, 0x42u8, 0x43u8].repeat(3333)),
92+
(
93+
"repeated_patterns",
94+
[0x41u8, 0x42u8, 0x43u8].repeat(3333),
95+
),
9396
];
9497

9598
let compressor = SmartCompressor::new();

src/crypto/post_quantum.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ impl HybridKeyPair {
8181
)?;
8282

8383
// Load Kyber keys from serialized files
84-
let kyber_public_bytes = std::fs::read(kyber_pub_path).map_err(PostQuantumError::Io)?;
85-
let kyber_secret_bytes = std::fs::read(kyber_sec_path).map_err(PostQuantumError::Io)?;
84+
let kyber_public_bytes =
85+
std::fs::read(kyber_pub_path).map_err(PostQuantumError::Io)?;
86+
let kyber_secret_bytes =
87+
std::fs::read(kyber_sec_path).map_err(PostQuantumError::Io)?;
8688

8789
// Deserialize Kyber keys
8890
let kyber_public = Kyber512PublicKey::from_bytes(&kyber_public_bytes).map_err(|e| {

0 commit comments

Comments
 (0)