Bug 1880110 - neqo 0.7.1, r=necko-reviewers,supply-chain-reviewers,jesup

Differential Revision: https://phabricator.services.mozilla.com/D201728

.cargo/config.in

@@ -20,11 +20,6 @@ git = "https://github.com/chris-zen/coremidi.git"
 rev = "fc68464b5445caf111e41f643a2e69ccce0b4f83"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/cloudflare/quiche?rev=09ea4b244096a013071cfe2175bbf2945fb7f8d1"]
-git = "https://github.com/cloudflare/quiche"
-rev = "09ea4b244096a013071cfe2175bbf2945fb7f8d1"
-replace-with = "vendored-sources"
-
 [source."git+https://github.com/franziskuskiefer/cose-rust?rev=43c22248d136c8b38fe42ea709d08da6355cf04b"]
 git = "https://github.com/franziskuskiefer/cose-rust"
 rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
@@ -90,9 +85,9 @@ git = "https://github.com/mozilla/mp4parse-rust"
 rev = "a138e40ec1c603615873e524b5b22e11c0ec4820"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/mozilla/neqo?tag=v0.7.0"]
+[source."git+https://github.com/mozilla/neqo?tag=v0.7.1"]
 git = "https://github.com/mozilla/neqo"
-tag = "v0.7.0"
+tag = "v0.7.1"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/mozilla/uniffi-rs.git?rev=afb29ebdc1d9edf15021b1c5332fc9f285bbe13b"]

netwerk/socket/neqo_glue/Cargo.toml

@@ -9,16 +9,16 @@ license = "MPL-2.0"
 name = "neqo_glue"
 
 [dependencies]
-neqo-http3 = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-transport = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-common = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-qpack = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
+neqo-http3 = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-transport = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-common = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-qpack = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
 nserror = { path = "../../../xpcom/rust/nserror" }
 nsstring = { path = "../../../xpcom/rust/nsstring" }
 xpcom = { path = "../../../xpcom/rust/xpcom" }
 thin-vec = { version = "0.2.1", features = ["gecko-ffi"] }
 log = "0.4.0"
-qlog = { git = "https://github.com/cloudflare/quiche", rev = "09ea4b244096a013071cfe2175bbf2945fb7f8d1" }
+qlog = "0.12"
 libc = "0.2.0"
 static_prefs = { path = "../../../modules/libpref/init/static_prefs"}
 uuid = { version = "1.0", features = ["v4"] }
@@ -27,7 +27,7 @@ uuid = { version = "1.0", features = ["v4"] }
 winapi = {version = "0.3", features = ["ws2def"] }
 
 [dependencies.neqo-crypto]
-tag = "v0.7.0"
+tag = "v0.7.1"
 git = "https://github.com/mozilla/neqo"
 default-features = false
 features = ["gecko"]

netwerk/test/http3server/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2018"
 license = "MPL-2.0"
 
 [dependencies]
-neqo-transport = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-common = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-http3 = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
-neqo-qpack = { tag = "v0.7.0", git = "https://github.com/mozilla/neqo" }
+neqo-transport = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-common = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-http3 = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
+neqo-qpack = { tag = "v0.7.1", git = "https://github.com/mozilla/neqo" }
 mio = "0.6.17"
 mio-extras = "2.0.5"
 log = "0.4.0"
@@ -21,7 +21,7 @@ tokio = { version = "1", features = ["rt-multi-thread"] }
 mozilla-central-workspace-hack = { version = "0.1", features = ["http3server"], optional = true }
 
 [dependencies.neqo-crypto]
-tag = "v0.7.0"
+tag = "v0.7.1"
 git = "https://github.com/mozilla/neqo"
 default-features = false
 features = ["gecko"]

supply-chain/audits.toml

@@ -3127,8 +3127,7 @@ delta = "0.9.0 -> 0.11.0"
 [[audits.qlog]]
 who = "Kershaw Chang <[email protected]>"
 criteria = "safe-to-deploy"
-delta = "0.11.0 -> 0.11.0@git:09ea4b244096a013071cfe2175bbf2945fb7f8d1"
-importable = false
+delta = "0.11.0 -> 0.12.0"
 
 [[audits.quote]]
 who = "Nika Layzell <[email protected]>"

supply-chain/config.toml

@@ -165,10 +165,6 @@ notes = "This is a first-party crate which is entirely unrelated to the crates.i
 audit-as-crates-io = true
 notes = "This is a first-party crate which is also published to crates.io, but we should publish audits for it for the benefit of the ecosystem."
 
-[policy.qlog]
-audit-as-crates-io = true
-notes = "Use this revision (09ea4b244096a013071cfe2175bbf2945fb7f8d1) of qlog temporarily."
-
 [policy.rure]
 audit-as-crates-io = true
 notes = "Identical to upstream, but with cdylib and staticlib targets disabled to avoid unnecessary build artifacts and linker errors."

third_party/rust/neqo-common/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"dbb5500f87df7aee6e680ac210ddb56b833aa82d6be5c407474de0895cee14e9","build.rs":"a17b1bb1bd3de3fc958f72d4d1357f7bc4432faa26640c95b5fbfccf40579d67","src/codec.rs":"8c14f09864b095e28ff52e7d96a12a6591fc9c4b20a9cafca6720d132c80efdc","src/datagram.rs":"1a7028d96a2e7385e94265de53189eb824b7cf12e0e2de5d67c3f3f8751b6043","src/event.rs":"4ef9e6f3f5168f2eacb7be982e062e743c64a64e809765d2139122839aa407e5","src/header.rs":"467b947f78bfe354d8bb51e8df0c2be69e75a45e2be688d81f0d268aa77c89ef","src/hrtime.rs":"d7c8849e9ec7a312878ea2bc28939717fa03969fb9aee259a4a516351ee37643","src/incrdecoder.rs":"577c32b9ace51f2daaf940be6d0c391c4f55cd42ef6848c68c1ffc970d8c57b5","src/lib.rs":"47c14084c6d475ebb855f3ed9302b31fa42780b93a816bf098c96987ffe33572","src/log.rs":"c68099eae0e9014be35173ac802165b128433d973390e1111c08df56e71df063","src/qlog.rs":"3f43dc4e5fdccb9d6ee74d9e7b3ff29da63e4eb9f631e4e35446e452d8ec7af6","src/timer.rs":"50a2de20933b7b5884337aded69e59e2523503481308f25de1bba1a11d505be8","src/tos.rs":"5b5a61c699266716afce2f5bda7c98151db3223ede41ce451c390863198e30a2","tests/log.rs":"480b165b7907ec642c508b303d63005eee1427115d6973a349eaf6b2242ed18d"},"package":null}
+{"files":{"Cargo.toml":"a5d8880c97023af584bb1116bf480ff957395e4e744c97aa52051b60b0bc5f80","build.rs":"a17b1bb1bd3de3fc958f72d4d1357f7bc4432faa26640c95b5fbfccf40579d67","src/codec.rs":"c652182a23ada920e55d6c73c5ede3ed3d01696db0b1826136585cfa926370b4","src/datagram.rs":"1a7028d96a2e7385e94265de53189eb824b7cf12e0e2de5d67c3f3f8751b6043","src/event.rs":"4ef9e6f3f5168f2eacb7be982e062e743c64a64e809765d2139122839aa407e5","src/header.rs":"467b947f78bfe354d8bb51e8df0c2be69e75a45e2be688d81f0d268aa77c89ef","src/hrtime.rs":"d7c8849e9ec7a312878ea2bc28939717fa03969fb9aee259a4a516351ee37643","src/incrdecoder.rs":"577c32b9ace51f2daaf940be6d0c391c4f55cd42ef6848c68c1ffc970d8c57b5","src/lib.rs":"47c14084c6d475ebb855f3ed9302b31fa42780b93a816bf098c96987ffe33572","src/log.rs":"8b8e12f4317892fd130c6d021a00d5125c535dea4c1b2c94c1a48d6a65b3aa84","src/qlog.rs":"3f43dc4e5fdccb9d6ee74d9e7b3ff29da63e4eb9f631e4e35446e452d8ec7af6","src/timer.rs":"d5d0e1ae7cc96f06fb2a8a53ef9236e11c4e1b0be2e9312f16c64e48c76acad2","src/tos.rs":"5b5a61c699266716afce2f5bda7c98151db3223ede41ce451c390863198e30a2","tests/log.rs":"480b165b7907ec642c508b303d63005eee1427115d6973a349eaf6b2242ed18d"},"package":null}

third_party/rust/neqo-common/Cargo.toml

@@ -11,16 +11,18 @@
 
 [package]
 edition = "2018"
-rust-version = "1.70.0"
+rust-version = "1.74.0"
 name = "neqo-common"
-version = "0.7.0"
-authors = ["Bobby Holley <bobbyholley@gmail.com>"]
+version = "0.7.1"
+authors = ["The Neqo Authors <necko@mozilla.com>"]
 build = "build.rs"
+homepage = "https://github.com/mozilla/neqo/"
 license = "MIT OR Apache-2.0"
+repository = "https://github.com/mozilla/neqo/"
 
 [dependencies]
 enum-map = "2.7"
-lazy_static = "1.4"
+qlog = "0.12"
 
 [dependencies.env_logger]
 version = "0.10"
@@ -30,12 +32,8 @@ default-features = false
 version = "0.4"
 default-features = false
 
-[dependencies.qlog]
-git = "https://github.com/cloudflare/quiche"
-rev = "09ea4b244096a013071cfe2175bbf2945fb7f8d1"
-
 [dependencies.time]
-version = "0.3.23"
+version = "0.3"
 features = ["formatting"]
 
 [dev-dependencies.test-fixture]

third_party/rust/neqo-common/src/codec.rs

@@ -112,9 +112,7 @@ impl<'a> Decoder<'a> {
 
     /// Decodes a QUIC varint.
     pub fn decode_varint(&mut self) -> Option<u64> {
-        let Some(b1) = self.decode_byte() else {
-            return None;
-        };
+        let b1 = self.decode_byte()?;
         match b1 >> 6 {
             0 => Some(u64::from(b1 & 0x3f)),
             1 => Some((u64::from(b1 & 0x3f) << 8) | self.decode_uint(1)?),

third_party/rust/neqo-common/src/log.rs

@@ -6,10 +6,13 @@
 
 #![allow(clippy::module_name_repetitions)]
 
-use std::{io::Write, sync::Once, time::Instant};
+use std::{
+    io::Write,
+    sync::{Once, OnceLock},
+    time::{Duration, Instant},
+};
 
 use env_logger::Builder;
-use lazy_static::lazy_static;
 
 #[macro_export]
 macro_rules! do_log {
@@ -42,17 +45,17 @@ macro_rules! log_subject {
     }};
 }
 
-static INIT_ONCE: Once = Once::new();
-
-lazy_static! {
-    static ref START_TIME: Instant = Instant::now();
+fn since_start() -> Duration {
+    static START_TIME: OnceLock<Instant> = OnceLock::new();
+    START_TIME.get_or_init(Instant::now).elapsed()
 }
 
 pub fn init() {
+    static INIT_ONCE: Once = Once::new();
     INIT_ONCE.call_once(|| {
         let mut builder = Builder::from_env("RUST_LOG");
         builder.format(|buf, record| {
-            let elapsed = START_TIME.elapsed();
+            let elapsed = since_start();
             writeln!(
                 buf,
                 "{}s{:3}ms {} {}",