Make pin_project_lite usage compile on windows

DataDog · Apr 12, 2022 · 6924d1c · 6924d1c
1 parent b37b093
commit 6924d1c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/.github/actions/cache/action.yaml b/.github/actions/cache/action.yaml
@@ -1,5 +1,5 @@
-name: '[rust] Checkout and cache' 
-description: '[rust] Checkout cache'
+name: '[rust] Cache' 
+description: '[rust] Cache'
 
 runs:
   using: composite

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ddprof-exporter/Cargo.toml b/ddprof-exporter/Cargo.toml
@@ -27,7 +27,7 @@ futures-core = { version = "0.3.0", default-features = false }
 futures-util = { version = "0.3.0", default-features = false }
 mime_guess = { version = "2.0", default-features = false }
 http-body = "0.4"
-pin-project = "1.0"
+pin-project-lite = "0.2.8"
 rustls = { version = "0.20.4", default-features = false }
 rustls-native-certs = { version = "0.6" }
 hyper-rustls = { version = "0.23", default-features = false, features = ["native-tokio", "http1", "tls12"] }

diff --git a/ddprof-exporter/src/connector/conn_stream.rs b/ddprof-exporter/src/connector/conn_stream.rs
@@ -8,17 +8,37 @@ use std::{
 
 use futures::{future, Future, FutureExt, TryFutureExt};
 use hyper_rustls::HttpsConnector;
-use pin_project::pin_project;
+use pin_project_lite::pin_project;
 
+#[cfg(unix)]
 pin_project! {
     #[derive(Debug)]
     #[project = ConnStreamProj]
     pub enum ConnStream {
-        Tcp{ #[pin] transport: tokio::net::TcpStream },
-        Tls{ #[pin] transport: tokio_rustls::client::TlsStream<tokio::net::TcpStream>},
+        Tcp {
+            #[pin] transport: tokio::net::TcpStream,
+        },
+        Tls {
+            #[pin] transport: tokio_rustls::client::TlsStream<tokio::net::TcpStream>,
+        },
         // Tokio doesn't handle unix sockets on windows
-        #[cfg(unix)]
-        Udp{ #[pin] transport: tokio::net::UnixStream },
+        Udp {
+            #[pin] transport: tokio::net::UnixStream,
+        },
+    }
+}
+
+#[cfg(not(unix))]
+pin_project! {
+    #[derive(Debug)]
+    #[project = ConnStreamProj]
+    pub enum ConnStream {
+        Tcp {
+            #[pin] transport: tokio::net::TcpStream,
+        },
+        Tls {
+            #[pin] transport: tokio_rustls::client::TlsStream<tokio::net::TcpStream>,
+        },
     }
 }