Skip to content

Commit c33e185

Browse files
abr-egnabr-egn
authored
RUST-1889 Un-deprecate EventSubscriber (#1138)
1 parent 9b27ba7 commit c33e185

File tree

25 files changed

+51
-105
lines changed

25 files changed

+51
-105
lines changed

‎.evergreen/MSRV-Cargo.toml.diff

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
76c76
2+
< derive_more = "0.99.17"
3+
---
4+
> derive_more = "=0.99.17"
15
112a113
26
> url = "=2.5.0"
37
167c168

‎src/client/session/test.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ use std::{future::Future, sync::Arc, time::Duration};
55
use bson::Document;
66
use futures::stream::StreamExt;
77

8-
#[allow(deprecated)]
9-
use crate::test::EventClient;
108
use crate::{
119
bson::{doc, Bson},
1210
coll::options::CountOptions,
@@ -20,6 +18,7 @@ use crate::{
2018
log_uncaptured,
2119
util::event_buffer::EventBuffer,
2220
Event,
21+
EventClient,
2322
TestClient,
2423
},
2524
Client,
@@ -245,7 +244,6 @@ async fn cluster_time_in_commands() {
245244
F: Fn(Client) -> G,
246245
G: Future<Output = Result<R>>,
247246
{
248-
#[allow(deprecated)]
249247
let mut subscriber = event_buffer.subscribe();
250248

251249
operation(client.clone())
@@ -313,7 +311,6 @@ async fn cluster_time_in_commands() {
313311
}
314312
}
315313

316-
#[allow(deprecated)]
317314
let mut subscriber = buffer.subscribe();
318315

319316
let client = Client::with_options(options).unwrap();
@@ -528,7 +525,6 @@ async fn find_and_getmore_share_session() {
528525
},
529526
];
530527

531-
#[allow(deprecated)]
532528
async fn run_test(
533529
client: &EventClient,
534530
coll: &Collection<Document>,

‎src/client/session/test/causal_consistency.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ async fn first_read_no_after_cluser_time() {
161161
)
162162
.await
163163
.unwrap_or_else(|e| panic!("{} failed: {}", name, e));
164-
#[allow(deprecated)]
164+
165165
let (started, _) = client.events.get_successful_command_execution(name);
166166

167167
// assert that no read concern was set.
@@ -241,7 +241,6 @@ async fn read_includes_after_cluster_time() {
241241
let op_time = session.operation_time().unwrap();
242242
op.execute(coll.clone(), &mut session).await.unwrap();
243243

244-
#[allow(deprecated)]
245244
let command_started = client
246245
.events
247246
.get_command_started_events(&[command_name])
@@ -287,7 +286,6 @@ async fn find_after_write_includes_after_cluster_time() {
287286
let op_time = session.operation_time().unwrap();
288287
coll.find_one(doc! {}).session(&mut session).await.unwrap();
289288

290-
#[allow(deprecated)]
291289
let command_started = client
292290
.events
293291
.get_command_started_events(&["find"])
@@ -332,7 +330,6 @@ async fn not_causally_consistent_omits_after_cluster_time() {
332330
.unwrap();
333331
op.execute(coll.clone(), &mut session).await.unwrap();
334332

335-
#[allow(deprecated)]
336333
let command_started = client
337334
.events
338335
.get_command_started_events(&[command_name])
@@ -369,7 +366,6 @@ async fn omit_after_cluster_time_standalone() {
369366
.unwrap();
370367
op.execute(coll.clone(), &mut session).await.unwrap();
371368

372-
#[allow(deprecated)]
373369
let command_started = client
374370
.events
375371
.get_command_started_events(&[command_name])
@@ -410,7 +406,6 @@ async fn omit_default_read_concern_level() {
410406
let op_time = session.operation_time().unwrap();
411407
op.execute(coll.clone(), &mut session).await.unwrap();
412408

413-
#[allow(deprecated)]
414409
let command_started = client
415410
.events
416411
.get_command_started_events(&[command_name])
@@ -457,7 +452,6 @@ async fn test_causal_consistency_read_concern_merge() {
457452
let op_time = session.operation_time().unwrap();
458453
op.execute(coll.clone(), &mut session).await.unwrap();
459454

460-
#[allow(deprecated)]
461455
let command_started = client
462456
.events
463457
.get_command_started_events(&[command_name])

‎src/cmap/test.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ impl Executor {
146146
}
147147

148148
async fn execute_test(self) {
149-
#[allow(deprecated)]
150149
let mut subscriber = self.state.events.subscribe();
151150

152151
let (updater, mut receiver) = TopologyUpdater::channel();
@@ -263,7 +262,6 @@ impl Operation {
263262
}
264263
}
265264
Operation::CheckIn { connection } => {
266-
#[allow(deprecated)]
267265
let mut subscriber = state.events.subscribe();
268266
let conn = state.connections.write().await.remove(&connection).unwrap();
269267
let id = conn.id;
@@ -302,7 +300,6 @@ impl Operation {
302300
}
303301
}
304302
Operation::Close => {
305-
#[allow(deprecated)]
306303
let mut subscriber = state.events.subscribe();
307304

308305
// pools are closed via their drop implementation

‎src/cmap/test/integration.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ async fn connection_error_during_establishment() {
198198
let _guard = client.enable_fail_point(fail_point).await.unwrap();
199199

200200
let buffer = EventBuffer::<CmapEvent>::new();
201-
#[allow(deprecated)]
201+
202202
let mut subscriber = buffer.subscribe();
203203

204204
let mut options = ConnectionPoolOptions::from_client_options(&client_options);
@@ -249,7 +249,6 @@ async fn connection_error_during_operation() {
249249
FailPoint::fail_command(&["ping"], FailPointMode::Times(10)).close_connection(true);
250250
let _guard = client.enable_fail_point(fail_point).await.unwrap();
251251

252-
#[allow(deprecated)]
253252
let mut subscriber = buffer.subscribe();
254253

255254
client

‎src/concern/test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ async fn snapshot_read_concern() {
165165
}
166166
}
167167

168-
#[allow(deprecated)]
169168
async fn assert_event_contains_read_concern(client: &EventClient) {
170169
let event = client
171170
.events
@@ -670,12 +669,11 @@ async fn command_contains_write_concern_aggregate() {
670669
#[tokio::test]
671670
#[function_name::named]
672671
async fn command_contains_write_concern_drop() {
673-
#[allow(deprecated)]
674672
let client = Client::test_builder().monitor_events().build().await;
675673
let coll: Collection<Document> = client.database("test").collection(function_name!());
676674

677675
coll.drop().await.unwrap();
678-
#[allow(deprecated)]
676+
679677
let mut events = client.events.clone();
680678
events.clear_cached_events();
681679
coll.insert_one(doc! { "foo": "bar" }).await.unwrap();

‎src/index/options.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ pub enum IndexVersion {
147147
Custom(u32),
148148
}
149149

150-
#[allow(deprecated)]
151150
impl Serialize for IndexVersion {
152151
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
153152
where
154153
S: Serializer,
155154
{
156155
match self {
156+
#[allow(deprecated)]
157157
IndexVersion::V0 => serializer.serialize_i32(0),
158158
IndexVersion::V1 => serializer.serialize_i32(1),
159159
IndexVersion::V2 => serializer.serialize_i32(2),
@@ -162,13 +162,13 @@ impl Serialize for IndexVersion {
162162
}
163163
}
164164

165-
#[allow(deprecated)]
166165
impl<'de> Deserialize<'de> for IndexVersion {
167166
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
168167
where
169168
D: Deserializer<'de>,
170169
{
171170
match i32::deserialize(deserializer)? {
171+
#[allow(deprecated)]
172172
0 => Ok(IndexVersion::V0),
173173
1 => Ok(IndexVersion::V1),
174174
2 => Ok(IndexVersion::V2),

‎src/sdam/description/topology/server_selection/test/in_window.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ async fn load_balancing_test() {
220220
.retain_startup_events()
221221
.build()
222222
.await;
223-
#[allow(deprecated)]
223+
224224
let mut subscriber = client.events.subscribe_all();
225225

226226
// wait for both servers pools to be saturated.

‎src/sdam/description/topology/test/sdam.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ async fn run_test(test_file: TestFile) {
277277
options.sdam_event_handler = Some(buffer.handler());
278278
options.test_options_mut().disable_monitoring_threads = true;
279279

280-
#[allow(deprecated)]
281280
let mut event_subscriber = buffer.subscribe();
282281
let mut topology = Topology::new(options.clone()).unwrap();
283282

@@ -598,7 +597,7 @@ async fn topology_closed_event_last() {
598597
.build()
599598
.await;
600599
let events = client.events.clone();
601-
#[allow(deprecated)]
600+
602601
let mut subscriber = events.subscribe_all();
603602

604603
client
@@ -644,7 +643,6 @@ async fn heartbeat_events() {
644643
.build()
645644
.await;
646645

647-
#[allow(deprecated)]
648646
let mut subscriber = client.events.subscribe_all();
649647

650648
if client.is_load_balanced() {

‎src/sdam/test.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ async fn sdam_pool_management() {
102102
.monitor_events()
103103
.build()
104104
.await;
105-
#[allow(deprecated)]
105+
106106
let mut subscriber = client.events.subscribe_all();
107107

108108
if !VersionReq::parse(">= 4.2.9")
@@ -185,7 +185,7 @@ async fn hello_ok_true() {
185185
}
186186

187187
let buffer = EventBuffer::new();
188-
#[allow(deprecated)]
188+
189189
let mut subscriber = buffer.subscribe();
190190

191191
let mut options = setup_client_options.clone();
@@ -270,7 +270,6 @@ async fn removed_server_monitor_stops() -> crate::error::Result<()> {
270270
let hosts = options.hosts.clone();
271271
let set_name = options.repl_set_name.clone().unwrap();
272272

273-
#[allow(deprecated)]
274273
let mut subscriber = buffer.subscribe();
275274
let topology = Topology::new(options)?;
276275

0 commit comments

Comments
 (0)