Skip to content

Commit fcc9851

Browse files
liamwarfieldLiam Warfield
authored andcommitted
missed a few #[cfg(feature = "ffi")]
This cased the CI to fail
1 parent 720743e commit fcc9851

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

src/client/conn.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ impl Builder {
560560
h1_parser_config: Default::default(),
561561
h1_title_case_headers: false,
562562
h1_preserve_header_case: false,
563+
#[cfg(feature = "ffi")]
563564
h1_preserve_header_order: false,
564565
h1_max_buf_size: None,
565566
#[cfg(feature = "ffi")]
@@ -966,9 +967,11 @@ impl Builder {
966967
if opts.h1_title_case_headers {
967968
conn.set_title_case_headers();
968969
}
970+
#[cfg(feature = "ffi")]
969971
if opts.h1_preserve_header_case {
970972
conn.set_preserve_header_case();
971973
}
974+
#[cfg(feature = "ffi")]
972975
if opts.h1_preserve_header_order {
973976
conn.set_preserve_header_order();
974977
}

src/ext.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use http::header::HeaderName;
55
#[cfg(feature = "http1")]
66
use http::header::{IntoHeaderName, ValueIter};
77
use http::HeaderMap;
8+
#[cfg(feature = "ffi")]
89
use std::collections::HashMap;
910
#[cfg(feature = "http2")]
1011
use std::fmt;
@@ -123,6 +124,7 @@ impl HeaderCaseMap {
123124
}
124125
}
125126

127+
#[cfg(feature = "ffi")]
126128
#[derive(Clone, Debug)]
127129
/// Hashmap<Headername, numheaders with that name>
128130
pub(crate) struct OriginalHeaderOrder {

src/ffi/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ unsafe impl AsTaskType for hyper_clientconn {
9393
ffi_fn! {
9494
/// Creates a new set of HTTP clientconn options to be used in a handshake.
9595
fn hyper_clientconn_options_new() -> *mut hyper_clientconn_options {
96-
let mut builder = conn::Builder::new();
96+
let builder = conn::Builder::new();
9797

9898
Box::into_raw(Box::new(hyper_clientconn_options {
9999
builder,

src/proto/h1/role.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ use crate::body::DecodedLength;
1616
#[cfg(feature = "server")]
1717
use crate::common::date;
1818
use crate::error::Parse;
19-
use crate::ext::{HeaderCaseMap, OriginalHeaderOrder};
19+
use crate::ext::HeaderCaseMap;
20+
#[cfg(feature = "ffi")]
21+
use crate::ext::OriginalHeaderOrder;
2022
use crate::headers;
2123
use crate::proto::h1::{
2224
Encode, Encoder, Http1Transaction, ParseContext, ParseResult, ParsedMessage,
@@ -316,6 +318,7 @@ impl Http1Transaction for Server {
316318
extensions.insert(header_case_map);
317319
}
318320

321+
#[cfg(feature = "ffi")]
319322
if let Some(header_order) = header_order {
320323
extensions.insert(header_order);
321324
}
@@ -1043,6 +1046,7 @@ impl Http1Transaction for Client {
10431046
extensions.insert(header_case_map);
10441047
}
10451048

1049+
#[cfg(feature = "ffi")]
10461050
if let Some(header_order) = header_order {
10471051
extensions.insert(header_order);
10481052
}

0 commit comments

Comments
 (0)