Remove the Headers structure

Author: ddragana

neqo-common/src/headers.rs

@@ -11,7 +11,6 @@ mod codec;
 mod datagram;
 pub mod event;
 pub mod header;
-pub mod headers;
 pub mod hrtime;
 mod incrdecoder;
 pub mod log;
@@ -21,17 +20,10 @@ pub mod timer;
 pub use self::codec::{Decoder, Encoder};
 pub use self::datagram::Datagram;
 pub use self::header::Header;
-pub use self::headers::Headers;
 pub use self::incrdecoder::{
     IncrementalDecoderBuffer, IncrementalDecoderIgnore, IncrementalDecoderUint,
 };
 
-type Res<T> = Result<T, Error>;
-
-pub enum Error {
-    InvalidHeader,
-}
-
 #[macro_use]
 extern crate lazy_static;
 

neqo-common/src/lib.rs

@@ -12,7 +12,7 @@ use crate::{
     features::extended_connect::{ExtendedConnectEvents, ExtendedConnectType},
     CloseType, Http3StreamInfo, HttpRecvStreamEvents, RecvStreamEvents, SendStreamEvents,
 };
-use neqo_common::{event::Provider as EventProvider, Headers};
+use neqo_common::{event::Provider as EventProvider, Header};
 use neqo_crypto::ResumptionToken;
 use neqo_transport::{AppError, StreamId, StreamType};
 
@@ -39,7 +39,7 @@ pub enum Http3ClientEvent {
     /// Response headers are received.
     HeaderReady {
         stream_id: StreamId,
-        headers: Headers,
+        headers: Vec<Header>,
         interim: bool,
         fin: bool,
     },
@@ -62,12 +62,12 @@ pub enum Http3ClientEvent {
     PushPromise {
         push_id: u64,
         request_stream_id: StreamId,
-        headers: Headers,
+        headers: Vec<Header>,
     },
     /// A push response headers are ready.
     PushHeaderReady {
         push_id: u64,
-        headers: Headers,
+        headers: Vec<Header>,
         interim: bool,
         fin: bool,
     },
@@ -143,7 +143,7 @@ impl HttpRecvStreamEvents for Http3ClientEvents {
     fn header_ready(
         &self,
         stream_info: Http3StreamInfo,
-        headers: Headers,
+        headers: Vec<Header>,
         interim: bool,
         fin: bool,
     ) {
@@ -210,7 +210,7 @@ impl ExtendedConnectEvents for Http3ClientEvents {
 }
 
 impl Http3ClientEvents {
-    pub fn push_promise(&self, push_id: u64, request_stream_id: StreamId, headers: Headers) {
+    pub fn push_promise(&self, push_id: u64, request_stream_id: StreamId, headers: Vec<Header>) {
         self.insert(Http3ClientEvent::PushPromise {
             push_id,
             request_stream_id,

neqo-http3/src/client_events.rs

@@ -22,11 +22,11 @@ use crate::send_message::SendMessage;
 use crate::settings::{HSettingType, HSettings, HttpZeroRttChecker};
 use crate::stream_type_reader::NewStreamHeadReader;
 use crate::{
-    client_events::Http3ClientEvents, CloseType, Header, Http3Parameters, Http3StreamType,
+    client_events::Http3ClientEvents, CloseType, Http3Parameters, Http3StreamType,
     HttpRecvStreamEvents, NewStreamType, Priority, PriorityHandler, ReceiveOutput, RecvStream,
     RecvStreamEvents, SendStream, SendStreamEvents,
 };
-use neqo_common::{qdebug, qerror, qinfo, qtrace, qwarn, Headers, MessageType, Role};
+use neqo_common::{qdebug, qerror, qinfo, qtrace, qwarn, Header, MessageType, Role};
 use neqo_qpack::decoder::QPackDecoder;
 use neqo_qpack::encoder::QPackEncoder;
 use neqo_transport::{AppError, Connection, ConnectionError, State, StreamId, StreamType};
@@ -547,7 +547,7 @@ impl Http3Connection {
         output
     }
 
-    fn create_fetch_headers<'b, 't, T>(request: &RequestDescription<'b, 't, T>) -> Res<Headers>
+    fn create_fetch_headers<'b, 't, T>(request: &RequestDescription<'b, 't, T>) -> Res<Vec<Header>>
     where
         T: AsRequestTarget<'t> + ?Sized + Debug,
     {
@@ -557,12 +557,12 @@ impl Http3Connection {
             .map_err(|_| Error::InvalidRequestTarget)?;
 
         // Transform pseudo-header fields
-        let mut final_headers = Headers::new(&[
+        let mut final_headers = vec![
             Header::new(":method", request.method),
             Header::new(":scheme", target.scheme()),
             Header::new(":authority", target.authority()),
             Header::new(":path", target.path()),
-        ]);
+        ];
         if let Some(conn_type) = request.connect_type {
             final_headers.push(Header::new(":protocol", conn_type.string()));
         }
@@ -619,7 +619,7 @@ impl Http3Connection {
         send_message
             .http_stream()
             .unwrap()
-            .send_headers(final_headers, conn)?;
+            .send_headers(&final_headers, conn)?;
 
         self.add_streams(
             id,
@@ -854,7 +854,7 @@ impl Http3Connection {
             (Some(s), Some(_r), false) => {
                 if s.http_stream()
                     .ok_or(Error::InvalidStreamId)?
-                    .send_headers(Headers::new(&[Header::new(":status", "400")]), conn)
+                    .send_headers(&[Header::new(":status", "400")], conn)
                     .is_ok()
                 {
                     mem::drop(self.stream_close_send(conn, stream_id));
@@ -873,7 +873,7 @@ impl Http3Connection {
             (Some(s), Some(r), true) => {
                 if s.http_stream()
                     .ok_or(Error::InvalidStreamId)?
-                    .send_headers(Headers::new(&[Header::new(":status", "200")]), conn)
+                    .send_headers(&[Header::new(":status", "200")], conn)
                     .is_ok()
                 {
                     let extended_conn = Rc::new(RefCell::new(ExtendedConnectSession::new(

neqo-http3/src/connection.rs

@@ -12,12 +12,11 @@ use crate::recv_message::{RecvMessage, RecvMessageInfo};
 use crate::request_target::AsRequestTarget;
 use crate::settings::HSettings;
 use crate::{
-    Header, Http3Parameters, Http3StreamType, NewStreamType, Priority, PriorityHandler,
-    ReceiveOutput,
+    Http3Parameters, Http3StreamType, NewStreamType, Priority, PriorityHandler, ReceiveOutput,
 };
 use neqo_common::{
     event::Provider as EventProvider, hex, hex_with_len, qdebug, qinfo, qlog::NeqoQlog, qtrace,
-    Datagram, Decoder, Encoder, MessageType, Role,
+    Datagram, Decoder, Encoder, Header, MessageType, Role,
 };
 use neqo_crypto::{agent::CertificateInfo, AuthenticationStatus, ResumptionToken, SecretAgentInfo};
 use neqo_qpack::Stats as QpackStats;
@@ -803,7 +802,7 @@ mod tests {
     use crate::qpack_encoder_receiver::EncoderRecvStream;
     use crate::settings::{HSetting, HSettingType, H3_RESERVED_SETTINGS};
     use crate::{Http3Server, Priority, RecvStream};
-    use neqo_common::{event::Provider, qtrace, Datagram, Decoder, Encoder, Headers};
+    use neqo_common::{event::Provider, qtrace, Datagram, Decoder, Encoder};
     use neqo_crypto::{AllowZeroRtt, AntiReplay, ResumptionToken};
     use neqo_qpack::{encoder::QPackEncoder, QpackSettings};
     use neqo_transport::tparams::{self, TransportParameter};
@@ -6446,10 +6445,10 @@ mod tests {
             e,
             Http3ClientEvent::HeaderReady {
                 stream_id: request_stream_id,
-                headers: Headers::new(&[
+                headers: vec![
                     Header::new(":status", "200"),
                     Header::new("content-type", "text/plain")
-                ]),
+                ],
                 interim: false,
                 fin: false,
             }

neqo-http3/src/connection_client.rs

@@ -10,10 +10,10 @@ use crate::recv_message::{RecvMessage, RecvMessageInfo};
 use crate::send_message::SendMessage;
 use crate::server_connection_events::{Http3ServerConnEvent, Http3ServerConnEvents};
 use crate::{
-    Error, Header, Http3Parameters, Http3StreamType, NewStreamType, Priority, PriorityHandler,
+    Error, Http3Parameters, Http3StreamType, NewStreamType, Priority, PriorityHandler,
     ReceiveOutput, Res,
 };
-use neqo_common::{event::Provider, qdebug, qinfo, qtrace, Headers, MessageType, Role};
+use neqo_common::{event::Provider, qdebug, qinfo, qtrace, Header, MessageType, Role};
 use neqo_transport::{AppError, Connection, ConnectionEvent, StreamId, StreamType};
 use std::rc::Rc;
 use std::time::Instant;
@@ -75,7 +75,7 @@ impl Http3ServerHandler {
             .ok_or(Error::InvalidStreamId)?
             .http_stream()
             .ok_or(Error::InvalidStreamId)?
-            .send_headers(Headers::from(headers), conn)?;
+            .send_headers(headers, conn)?;
         self.base_handler.stream_has_pending_data(stream_id);
         self.needs_processing = true;
         Ok(())

neqo-http3/src/connection_server.rs

@@ -10,7 +10,7 @@ use super::{ExtendedConnectEvents, ExtendedConnectType};
 use crate::{
     CloseType, Error, Http3StreamInfo, HttpRecvStreamEvents, RecvStreamEvents, SendStreamEvents,
 };
-use neqo_common::{qtrace, Headers, Role};
+use neqo_common::{qtrace, Header, Role};
 use neqo_transport::StreamId;
 use std::cell::RefCell;
 use std::collections::BTreeSet;
@@ -148,7 +148,7 @@ impl HttpRecvStreamEvents for Rc<RefCell<ExtendedConnectSession>> {
     fn header_ready(
         &self,
         stream_info: Http3StreamInfo,
-        headers: Headers,
+        headers: Vec<Header>,
         _interim: bool,
         _fin: bool,
     ) {