Undo

mozilla · Jan 2, 2024 · cc98a37 · cc98a37
1 parent cddd7fa
commit cc98a37
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/neqo-transport/src/cc/cubic.rs b/neqo-transport/src/cc/cubic.rs
@@ -39,9 +39,9 @@ const EXPONENTIAL_GROWTH_REDUCTION: f64 = 2.0;
 /// This has the effect of reducing larger values to `1<<53`.
 /// If you have a congestion window that large, something is probably wrong.
 fn convert_to_f64(v: usize) -> f64 {
-    let mut f_64 = f64::from(u32::try_from(v >> 21).unwrap_or(u32::MAX));
+    let mut f_64 = f64::try_from(u32::try_from(v >> 21).unwrap_or(u32::MAX)).unwrap();
     f_64 *= 2_097_152.0; // f_64 <<= 21
-    f_64 += f64::from(u32::try_from(v & 0x1f_ffff).unwrap());
+    f_64 += f64::try_from(u32::try_from(v & 0x1f_ffff).unwrap()).unwrap();
     f_64
 }
 

diff --git a/neqo-transport/src/cc/mod.rs b/neqo-transport/src/cc/mod.rs
@@ -20,7 +20,7 @@ mod classic_cc;
 mod cubic;
 mod new_reno;
 
-pub use classic_cc::ClassicCongestionControl;
+pub use classic_cc::{ClassicCongestionControl, CWND_INITIAL, CWND_INITIAL_PKTS, CWND_MIN};
 pub use cubic::Cubic;
 pub use new_reno::NewReno;
 

diff --git a/neqo-transport/src/connection/mod.rs b/neqo-transport/src/connection/mod.rs
@@ -67,7 +67,7 @@ mod state;
 pub mod test_internal;
 
 pub use crate::send_stream::{RetransmissionPriority, SendStreamStats, TransmissionPriority};
-pub use params::ConnectionParameters;
+pub use params::{ConnectionParameters, ACK_RATIO_SCALE};
 pub use state::{ClosingFrame, State};
 
 use idle::IdleTimeout;

diff --git a/neqo-transport/src/path.rs b/neqo-transport/src/path.rs
@@ -56,7 +56,6 @@ pub type PathRef = Rc<RefCell<Path>>;
 #[derive(Debug, Default)]
 pub struct Paths {
     /// All of the paths.  All of these paths will be permanent.
-    #[allow(clippy::struct_field_names)]
     paths: Vec<PathRef>,
     /// This is the primary path.  This will only be `None` initially, so
     /// care needs to be taken regarding that only during the handshake.