Skip to content

Commit 72d2f7c

Browse files
committed
Bump rust version to 1.87 and asyncs to 0.4.0
See also: * dtolnay/linkme#61 * rust-lang/rust#133832 * rust-lang/rust@c51b9b6
1 parent b87cdec commit 72d2f7c

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

Cargo.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ homepage = "https://github.com/kezhuw/seamdb"
2222
repository = "https://github.com/kezhuw/seamdb"
2323
description = "A computation cluster to seam existing services to provide database interfaces"
2424
documentation = "https://docs.rs/seamdb"
25+
rust-version = "1.87"
2526

2627
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2728

@@ -57,7 +58,7 @@ tokio-stream = "0.1.15"
5758
datafusion = "47.0.0"
5859
pgwire = "0.27.0"
5960
derive-where = "1.2.7"
60-
asyncs = { version = "0.3.0", features = ["tokio"] }
61+
asyncs = { version = "0.4.0", features = ["tokio"] }
6162
async-io = "2.3.4"
6263
bytes = "1.7.2"
6364
lazy_static = "1.5.0"
@@ -75,7 +76,7 @@ imstr = "0.2.0"
7576

7677
[dev-dependencies]
7778
assertor = "0.0.2"
78-
asyncs = { version = "0.3.0", features = ["test", "tokio"] }
79+
asyncs = { version = "0.4.0", features = ["test", "tokio"] }
7980
env_logger = "0.11.5"
8081
serial_test = "2.0.0"
8182
speculoos = "0.11.0"
@@ -84,12 +85,6 @@ test-log = "0.2.12"
8485
testcontainers = "0.14.0"
8586
tracing-test = "0.2.4"
8687

87-
[profile.dev]
88-
lto = "thin"
89-
90-
[profile.release]
91-
lto = "thin"
92-
9388
[workspace]
9489
members = ["src/protos/build"]
9590

src/tablet/service.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,16 +472,16 @@ impl TabletServiceState {
472472
responser.send();
473473
}
474474
},
475-
Some(ref mut txn) = tablet.store.store.updated_txns().recv() => {
475+
Some(mut txn) = tablet.store.store.updated_txns().recv() => {
476476
trace!("update txn {:?}", txn);
477-
let (replication, requests) = tablet.store.store.update_txn(txn);
477+
let (replication, requests) = tablet.store.store.update_txn(&mut txn);
478478
trace!("unblock txn {}(epoch:{}, {:?}) requests {:?}", txn.id(), txn.epoch(), txn.status(), requests);
479479
unblocking_requests.extend(requests.into_iter());
480480
if let Some(replication) = replication {
481481
self.clock.update(txn.commit_ts());
482482
txn.write_set.clear();
483483
let message = DataMessage {
484-
temporal: Temporal::Transaction(std::mem::take(txn)),
484+
temporal: Temporal::Transaction(txn),
485485
..tablet.new_data_message()
486486
};
487487
tablet.store.producer.queue(&message)?;

0 commit comments

Comments
 (0)