4 files changed, 10 insertions, 2 deletions
diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml
index 85b4e592..45daa2b1 100644
--- a/tokio-util/Cargo.toml
+++ b/tokio-util/Cargo.toml
@@ -25,11 +25,10 @@ publish = false
 default = []
 
 # Shorthand for enabling everything
-full = ["codec", "udp", "compat", "io"]
+full = ["codec", "compat", "io"]
 
 compat = ["futures-io",]
 codec = ["tokio/stream"]
-udp = ["tokio/udp"]
 io = []
 
 [dependencies]
diff --git a/tokio-util/src/cfg.rs b/tokio-util/src/cfg.rs
index 2efa5f09..f9176747 100644
--- a/tokio-util/src/cfg.rs
+++ b/tokio-util/src/cfg.rs
@@ -18,6 +18,7 @@ macro_rules! cfg_compat {
     }
 }
 
+/*
 macro_rules! cfg_udp {
     ($($item:item)*) => {
         $(
@@ -27,6 +28,7 @@ macro_rules! cfg_udp {
         )*
     }
 }
+*/
 
 macro_rules! cfg_io {
     ($($item:item)*) => {
diff --git a/tokio-util/src/lib.rs b/tokio-util/src/lib.rs
index 24a8af95..b96d9044 100644
--- a/tokio-util/src/lib.rs
+++ b/tokio-util/src/lib.rs
@@ -30,9 +30,14 @@ cfg_codec! {
     pub mod codec;
 }
 
+/*
+Disabled due to removal of poll_ functions on UdpSocket.
+
+See https://github.com/tokio-rs/tokio/issues/2830
 cfg_udp! {
     pub mod udp;
 }
+*/
 
 cfg_compat! {
     pub mod compat;
diff --git a/tokio-util/tests/udp.rs b/tokio-util/tests/udp.rs
index 4820ac72..99763854 100644
--- a/tokio-util/tests/udp.rs
+++ b/tokio-util/tests/udp.rs
@@ -1,3 +1,4 @@
+/*
 #![warn(rust_2018_idioms)]
 
 use tokio::{net::UdpSocket, stream::StreamExt};
@@ -100,3 +101,4 @@ async fn send_framed_lines_codec() -> std::io::Result<()> {
 
     Ok(())
 }
+*/