Skip to content

Commit 3e132d2

Browse files
robjtederobjtede
authored
update tokio-uring to 0.3 (#448)
1 parent c5d6174 commit 3e132d2

File tree

8 files changed

+31
-18
lines changed

8 files changed

+31
-18
lines changed

‎actix-rt/CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4+
5+
6+
## 2.7.0 - 2022-03-08
7+
- Update `tokio-uring` dependency to `0.3.0`. [#448]
48
- Minimum supported Rust version (MSRV) is now 1.49.
59

10+
[#448]: https://github.com/actix/actix-net/pull/448
11+
612

713
## 2.6.0 - 2022-01-12
814
- Update `tokio-uring` dependency to `0.2.0`. [#436]

‎actix-rt/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "actix-rt"
3-
version = "2.6.0"
3+
version = "2.7.0"
44
authors = [
55
"Nikolay Kim <[email protected]>",
66
"Rob Ede <[email protected]>",
@@ -29,7 +29,7 @@ actix-macros = { version = "0.2.3", optional = true }
2929
futures-core = { version = "0.3", default-features = false }
3030
tokio = { version = "1.13.1", features = ["rt", "net", "parking_lot", "signal", "sync", "time"] }
3131

32-
# runtime for io-uring feature
32+
# runtime for `io-uring` feature
3333
[target.'cfg(target_os = "linux")'.dependencies]
3434
tokio-uring = { version = "0.3", optional = true }
3535

‎actix-rt/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
> Tokio-based single-threaded async runtime for the Actix ecosystem.
44
55
[![crates.io](https://img.shields.io/crates/v/actix-rt?label=latest)](https://crates.io/crates/actix-rt)
6-
[![Documentation](https://docs.rs/actix-rt/badge.svg?version=2.6.0)](https://docs.rs/actix-rt/2.6.0)
6+
[![Documentation](https://docs.rs/actix-rt/badge.svg?version=2.7.0)](https://docs.rs/actix-rt/2.7.0)
77
[![Version](https://img.shields.io/badge/rustc-1.46+-ab6000.svg)](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
88
![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-rt.svg)
99
<br />
10-
[![dependency status](https://deps.rs/crate/actix-rt/2.6.0/status.svg)](https://deps.rs/crate/actix-rt/2.6.0)
10+
[![dependency status](https://deps.rs/crate/actix-rt/2.7.0/status.svg)](https://deps.rs/crate/actix-rt/2.7.0)
1111
![Download](https://img.shields.io/crates/d/actix-rt.svg)
1212
[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/WghFtEH6Hb)
1313

‎actix-server/CHANGES.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4+
5+
6+
## 2.1.0 - 2022-03-08
7+
- Update `tokio-uring` dependency to `0.3.0`. [#448]
8+
- Logs emitted now use the `tracing` crate with `log` compatibility. [#448]
49
- Wait for accept thread to stop before sending completion signal. [#443]
510

611
[#443]: https://github.com/actix/actix-net/pull/443
12+
[#448]: https://github.com/actix/actix-net/pull/448
713

814

915
## 2.0.0 - 2022-01-19

‎actix-server/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "actix-server"
3-
version = "2.0.0"
3+
version = "2.1.0"
44
authors = [
55
"Nikolay Kim <[email protected]>",
66
"fakeshadow <[email protected]>",
@@ -24,9 +24,9 @@ default = []
2424
io-uring = ["tokio-uring", "actix-rt/io-uring"]
2525

2626
[dependencies]
27-
actix-rt = { version = "2.6.0", default-features = false }
28-
actix-service = "2.0.0"
29-
actix-utils = "3.0.0"
27+
actix-rt = { version = "2.7", default-features = false }
28+
actix-service = "2"
29+
actix-utils = "3"
3030

3131
futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
3232
futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
@@ -36,7 +36,7 @@ socket2 = "0.4.2"
3636
tokio = { version = "1.13.1", features = ["sync"] }
3737
tracing = { version = "0.1.30", features = ["log"] }
3838

39-
# runtime for io-uring feature
39+
# runtime for `io-uring` feature
4040
[target.'cfg(target_os = "linux")'.dependencies]
4141
tokio-uring = { version = "0.3", optional = true }
4242

‎actix-server/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
> General purpose TCP server built for the Actix ecosystem.
44
55
[![crates.io](https://img.shields.io/crates/v/actix-server?label=latest)](https://crates.io/crates/actix-server)
6-
[![Documentation](https://docs.rs/actix-server/badge.svg?version=2.0.0)](https://docs.rs/actix-server/2.0.0)
6+
[![Documentation](https://docs.rs/actix-server/badge.svg?version=2.1.0)](https://docs.rs/actix-server/2.1.0)
77
[![Version](https://img.shields.io/badge/rustc-1.52+-ab6000.svg)](https://blog.rust-lang.org/2021/05/06/Rust-1.52.0.html)
88
![License](https://img.shields.io/crates/l/actix-server.svg)
9-
[![Dependency Status](https://deps.rs/crate/actix-server/2.0.0/status.svg)](https://deps.rs/crate/actix-server/2.0.0)
9+
[![Dependency Status](https://deps.rs/crate/actix-server/2.1.0/status.svg)](https://deps.rs/crate/actix-server/2.1.0)
1010
![Download](https://img.shields.io/crates/d/actix-server.svg)
1111
[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
1212

‎actix-server/examples/file-reader.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ async fn run() -> io::Result<()> {
3939
// wait for next line
4040
match framed.next().await {
4141
Some(Ok(line)) => {
42-
match File::open(line).await {
42+
match File::open(&line).await {
4343
Ok(mut file) => {
44+
tracing::info!("reading file: {}", &line);
45+
4446
// read file into String buffer
4547
let mut buf = String::new();
4648
file.read_to_string(&mut buf).await?;

‎actix-server/examples/tcp-echo.rs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ use actix_service::{fn_service, ServiceFactoryExt as _};
2323
use bytes::BytesMut;
2424
use futures_util::future::ok;
2525
use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
26-
use tracing::{error, info};
2726

2827
async fn run() -> io::Result<()> {
2928
env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
3029

3130
let count = Arc::new(AtomicUsize::new(0));
3231

3332
let addr = ("127.0.0.1", 8080);
34-
info!("starting server on port: {}", &addr.0);
33+
tracing::info!("starting server on port: {}", &addr.0);
3534

3635
// Bind socket address and start worker(s). By default, the server uses the number of physical
3736
// CPU cores as the worker count. For this reason, the closure passed to bind needs to return
@@ -58,14 +57,14 @@ async fn run() -> io::Result<()> {
5857

5958
// more bytes to process
6059
Ok(bytes_read) => {
61-
info!("[{}] read {} bytes", num, bytes_read);
60+
tracing::info!("[{}] read {} bytes", num, bytes_read);
6261
stream.write_all(&buf[size..]).await.unwrap();
6362
size += bytes_read;
6463
}
6564

6665
// stream error; bail from loop with error
6766
Err(err) => {
68-
error!("Stream Error: {:?}", err);
67+
tracing::error!("Stream Error: {:?}", err);
6968
return Err(());
7069
}
7170
}
@@ -75,10 +74,10 @@ async fn run() -> io::Result<()> {
7574
Ok((buf.freeze(), size))
7675
}
7776
})
78-
.map_err(|err| error!("Service Error: {:?}", err))
77+
.map_err(|err| tracing::error!("Service Error: {:?}", err))
7978
.and_then(move |(_, size)| {
8079
let num = num2.load(Ordering::SeqCst);
81-
info!("[{}] total bytes read: {}", num, size);
80+
tracing::info!("[{}] total bytes read: {}", num, size);
8281
ok(size)
8382
})
8483
})?

0 commit comments

Comments
 (0)