From 6257a8d402414c75b2c6962a98cb88b542c34105 Mon Sep 17 00:00:00 2001
From: Tomas Zemanovic <tzemanovic@gmail.com>
Date: Tue, 27 Apr 2021 15:00:13 +0200
Subject: [PATCH] protocols/gossipsub: Remove `regex-filter` feature flag
 (#2056)

Remove `regex-filter` feature flag thus always enabling
`regex::RegexSubscriptionFilter`.
---
 CHANGELOG.md                                   | 1 +
 Cargo.toml                                     | 2 +-
 protocols/gossipsub/CHANGELOG.md               | 5 +++++
 protocols/gossipsub/Cargo.toml                 | 2 +-
 protocols/gossipsub/src/subscription_filter.rs | 1 -
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62705accf6e..5848eeaa567 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 
 - Update individual crates.
     - `libp2p-swarm-derive`
+    - `libp2p-gossipsub`
 
 ## Version 0.37.0 [2021-04-13]
 
diff --git a/Cargo.toml b/Cargo.toml
index acb1ab8db73..1b1a5cebbbb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,7 +66,7 @@ futures = "0.3.1"
 lazy_static = "1.2"
 libp2p-core = { version = "0.28.3", path = "core",  default-features = false }
 libp2p-floodsub = { version = "0.29.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.30.0", path = "./protocols/gossipsub", optional = true }
+libp2p-gossipsub = { version = "0.30.1", path = "./protocols/gossipsub", optional = true }
 libp2p-identify = { version = "0.29.0", path = "protocols/identify", optional = true }
 libp2p-kad = { version = "0.30.0", path = "protocols/kad", optional = true }
 libp2p-mplex = { version = "0.28.0", path = "muxers/mplex", optional = true }
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
index 9d9169611ff..7bc1f9aa036 100644
--- a/protocols/gossipsub/CHANGELOG.md
+++ b/protocols/gossipsub/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.30.1 [2021-04-27]
+
+- Remove `regex-filter` feature flag thus always enabling `regex::RegexSubscriptionFilter` [PR
+  2056](https://github.com/libp2p/rust-libp2p/pull/2056).
+
 # 0.30.0 [2021-04-13]
 
 - Update `libp2p-swarm`.
diff --git a/protocols/gossipsub/Cargo.toml b/protocols/gossipsub/Cargo.toml
index eaa21894ff2..a0ecc7e3cbf 100644
--- a/protocols/gossipsub/Cargo.toml
+++ b/protocols/gossipsub/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-gossipsub"
 edition = "2018"
 description = "Gossipsub protocol for libp2p"
-version = "0.30.0"
+version = "0.30.1"
 authors = ["Age Manning <Age@AgeManning.com>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
diff --git a/protocols/gossipsub/src/subscription_filter.rs b/protocols/gossipsub/src/subscription_filter.rs
index 7aa94416183..f98cbf3c42b 100644
--- a/protocols/gossipsub/src/subscription_filter.rs
+++ b/protocols/gossipsub/src/subscription_filter.rs
@@ -200,7 +200,6 @@ where
     }
 }
 
-#[cfg(feature = "regex-filter")]
 pub mod regex {
     use super::TopicSubscriptionFilter;
     use crate::TopicHash;