Merge branch 'main' into h3_upload_test

mozilla · May 16, 2024 · 5c4c60e · 5c4c60e
2 parents ac395f3 + a71e43d
commit 5c4c60e
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 511 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ resolver = "2"
 homepage = "https://github.com/mozilla/neqo/"
 repository = "https://github.com/mozilla/neqo/"
 authors = ["The Neqo Authors <[email protected]>"]
-version = "0.7.7"
+version = "0.7.8"
 # Keep in sync with `.rustfmt.toml` `edition`.
 edition = "2021"
 license = "MIT OR Apache-2.0"

diff --git a/neqo-common/Cargo.toml b/neqo-common/Cargo.toml
@@ -35,7 +35,3 @@ features = ["timeapi"]
 [lib]
 # See https://github.com/bheisler/criterion.rs/blob/master/book/src/faq.md#cargo-bench-gives-unrecognized-option-errors-for-valid-command-line-options
 bench = false
-
-[[bench]]
-name = "timer"
-harness = false
diff --git a/neqo-common/benches/timer.rs b/neqo-common/benches/timer.rs
diff --git a/neqo-common/src/lib.rs b/neqo-common/src/lib.rs
@@ -16,7 +16,6 @@ pub mod hrtime;
 mod incrdecoder;
 pub mod log;
 pub mod qlog;
-pub mod timer;
 pub mod tos;
 
 use std::fmt::Write;