actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2025-01-18 13:01:49 +01:00
Code Issues Releases Wiki Activity

chore: fmt project

Browse Source
This commit is contained in:
Rob Ede 2024-12-29 14:27:56 +00:00
parent 23f797a81d
commit ecba6e21da
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
28 changed files with 104 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@ -1,10 +1,12 @@
## PR Type
<!-- What kind of change does this PR make? -->
<!-- Bug Fix / Feature / Refactor / Code Style / Other -->
INSERT_PR_TYPE
## PR Checklist
Check your PR fulfills the following:
<!-- For draft PRs check the boxes as you complete them. -->
@ -14,11 +16,10 @@ Check your PR fulfills the following:
- [ ] A changelog entry has been made for the appropriate packages.
- [ ] Format code with the latest stable rustfmt
## Overview
<!-- Describe the current and new behavior. -->
<!-- Emphasize any breaking changes. -->
<!-- If this PR fixes or closes an issue, reference it here. -->
<!-- Closes #000 -->

29
.taplo.toml Normal file
View File

@ -0,0 +1,29 @@
exclude = ["target/*"]
include = ["**/*.toml"]
[formatting]
column_width = 110
[[rule]]
include = ["**/Cargo.toml"]
keys = [
"dependencies",
"*-dependencies",
"workspace.dependencies",
"workspace.*-dependencies",
"target.*.dependencies",
"target.*.*-dependencies",
]
formatting.reorder_keys = true
[[rule]]
include = ["**/Cargo.toml"]
keys = [
"dependencies.*",
"*-dependencies.*",
"workspace.dependencies.*",
"workspace.*-dependencies.*",
"target.*.dependencies",
"target.*.*-dependencies",
]
formatting.reorder_keys = false

6
Cargo.toml
View File

@ -36,3 +36,9 @@ local-waker = { path = "local-waker" }
lto = true
opt-level = 3
codegen-units = 1
[workspace.lints.rust]
rust_2018_idioms = "deny"
nonstandard-style = "deny"
future_incompatible = "deny"
missing_docs = { level = "warn", priority = -1 }

16
actix-codec/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "actix-codec"
version = "0.5.2"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
description = "Codec utilities for working with framed protocols"
keywords = ["network", "framework", "async", "futures"]
repository = "https://github.com/actix/actix-net"
@ -14,13 +11,7 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"bytes::*",
"futures_core::*",
"futures_sink::*",
"tokio::*",
"tokio_util::*",
]
allowed_external_types = ["bytes::*", "futures_core::*", "futures_sink::*", "tokio::*", "tokio_util::*"]
[dependencies]
bitflags = "2"
@ -40,3 +31,6 @@ tokio-test = "0.4.2"
[[bench]]
name = "lines"
harness = false
[lints]
workspace = true

2
actix-codec/benches/lines.rs
View File

@ -1,3 +1,5 @@
#![allow(missing_docs)]
use bytes::BytesMut;
use criterion::{criterion_group, criterion_main, Criterion};

2
actix-codec/src/lib.rs
View File

@ -6,8 +6,6 @@
//! [`Sink`]: futures_sink::Sink
//! [`Stream`]: futures_core::Stream
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

11
actix-macros/Cargo.toml
View File

@ -2,9 +2,9 @@
name = "actix-macros"
version = "0.2.4"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Ibraheem Ahmed <ibrah1440@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
"Nikolay Kim <fafhrd91@gmail.com>",
"Ibraheem Ahmed <ibrah1440@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
description = "Macros for Actix system and runtime"
repository = "https://github.com/actix/actix-net"
@ -15,7 +15,7 @@ rust-version.workspace = true
[package.metadata.cargo-machete]
ignored = [
"proc_macro2", # specified for minimal versions compat
"proc_macro2", # specified for minimal versions compat
]
[lib]
@ -34,3 +34,6 @@ actix-rt = "2"
futures-util = { version = "0.3.17", default-features = false }
rustversion-msrv = "0.100"
trybuild = "1"
[lints]
workspace = true

2
actix-macros/src/lib.rs
View File

@ -8,8 +8,6 @@
//! # Tests
//! See docs for the [`#[test]`](macro@test) macro.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

13
actix-rt/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "actix-rt"
version = "2.10.0"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
description = "Tokio-based single-threaded async runtime for the Actix ecosystem"
keywords = ["async", "futures", "io", "runtime"]
homepage = "https://actix.rs"
@ -15,10 +12,7 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"actix_macros::*",
"tokio::*",
]
allowed_external_types = ["actix_macros::*", "tokio::*"]
[features]
default = ["macros"]
@ -37,3 +31,6 @@ tokio-uring = { version = "0.5", optional = true }
[dev-dependencies]
tokio = { version = "1.23.1", features = ["full"] }
[lints]
workspace = true

2
actix-rt/src/lib.rs
View File

@ -41,8 +41,6 @@
//! Note that there are currently some unimplemented parts of using `actix-rt` with `io-uring`.
//! In particular, when running a `System`, only `System::block_on` is supported.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
#![allow(clippy::type_complexity)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

16
actix-server/Cargo.toml
View File

@ -2,9 +2,9 @@
name = "actix-server"
version = "2.5.0"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
"Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
"Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
]
description = "General purpose TCP server built for the Actix ecosystem"
keywords = ["network", "tcp", "server", "framework", "async"]
@ -16,9 +16,7 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"tokio::*",
]
allowed_external_types = ["tokio::*"]
[features]
default = []
@ -28,7 +26,6 @@ io-uring = ["tokio-uring", "actix-rt/io-uring"]
actix-rt = { version = "2.10", default-features = false }
actix-service = "2"
actix-utils = "3"
futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] }
mio = { version = "1", features = ["os-poll", "net"] }
@ -45,6 +42,9 @@ actix-codec = "0.5"
actix-rt = "2.8"
bytes = "1"
pretty_env_logger = "0.5"
futures-util = { version = "0.3.17", default-features = false, features = ["sink", "async-await-macro"] }
pretty_env_logger = "0.5"
tokio = { version = "1.23.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }
[lints]
workspace = true

2
actix-server/examples/file-reader.rs
View File

@ -8,6 +8,8 @@
//!
//! Follow the prompt and enter a file path, relative or absolute.
#![allow(missing_docs)]
use std::io;
use actix_codec::{Framed, LinesCodec};

2
actix-server/src/lib.rs
View File

@ -1,7 +1,5 @@
//! General purpose TCP server.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

1
actix-server/src/socket.rs
View File

@ -160,6 +160,7 @@ pub enum MioStream {
/// Helper trait for converting a Mio stream into a Tokio stream.
pub trait FromStream: Sized {
/// Creates stream from a `mio` stream.
fn from_mio(sock: MioStream) -> io::Result<Self>;
}

8
actix-service/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "actix-service"
version = "2.0.2"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
description = "Service trait and combinators for representing asynchronous request/response operations."
keywords = ["network", "framework", "async", "futures", "service"]
categories = ["network-programming", "asynchronous", "no-std"]
@ -22,3 +19,6 @@ pin-project-lite = "0.2"
actix-rt = "2"
actix-utils = "3"
futures-util = { version = "0.3.17", default-features = false }
[lints]
workspace = true

2
actix-service/examples/clone.rs
View File

@ -1,3 +1,5 @@
#![allow(missing_docs)]
use std::{future::Future, sync::mpsc, time::Duration};
async fn oracle<F, Fut>(f: F) -> (u32, u32)

2
actix-service/src/lib.rs
View File

@ -1,8 +1,6 @@
//! See [`Service`] docs for information on this crate's foundational trait.
#![no_std]
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
#![allow(clippy::type_complexity)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

24
actix-tls/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "actix-tls"
version = "3.4.0"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
description = "TLS acceptor and connector services for Actix ecosystem"
keywords = ["network", "tls", "ssl", "async", "transport"]
repository = "https://github.com/actix/actix-net.git"
@ -18,17 +15,12 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"actix_service::*",
"actix_utils::*",
"futures_core::*",
"tokio::*",
]
allowed_external_types = ["actix_service::*", "actix_utils::*", "futures_core::*", "tokio::*"]
[package.metadata.cargo-machete]
ignored = [
"rustls_021", # specified to force version with add_trust_anchors method
"rustls_webpki_0101", # specified to force secure version
"rustls_021", # specified to force version with add_trust_anchors method
"rustls_webpki_0101", # specified to force secure version
]
[features]
@ -76,7 +68,6 @@ uri = ["dep:http-0_2", "dep:http-1"]
actix-rt = { version = "2.2", default-features = false }
actix-service = "2"
actix-utils = "3"
futures-core = { version = "0.3.7", default-features = false, features = ["alloc"] }
impl-more = "0.1"
pin-project-lite = "0.2.7"
@ -120,7 +111,7 @@ rustls-native-certs-07 = { package = "rustls-native-certs", version = "0.7", opt
tokio-native-tls = { version = "0.3", optional = true }
[target.'cfg(any())'.dependencies]
rustls-021 = { package = "rustls", version = "0.21.6", optional = true } # force version with add_trust_anchors method
rustls-021 = { package = "rustls", version = "0.21.6", optional = true } # force version with add_trust_anchors method
rustls-webpki-0101 = { package = "rustls-webpki", version = "0.101.4", optional = true } # force secure version
[dev-dependencies]
@ -128,9 +119,9 @@ actix-codec = "0.5"
actix-rt = "2.2"
actix-server = "2"
bytes = "1"
pretty_env_logger = "0.5"
futures-util = { version = "0.3.17", default-features = false, features = ["sink"] }
itertools = "0.13"
pretty_env_logger = "0.5"
rcgen = "0.13"
rustls-pemfile = "2"
tokio-rustls-026 = { package = "tokio-rustls", version = "0.26" }
@ -139,3 +130,6 @@ trust-dns-resolver = "0.23"
[[example]]
name = "accept-rustls"
required-features = ["accept", "rustls-0_23"]
[lints]
workspace = true

2
actix-tls/src/lib.rs
View File

@ -1,7 +1,5 @@
//! TLS acceptor and connector services for the Actix ecosystem.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]

11
actix-tracing/Cargo.toml
View File

@ -13,20 +13,17 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"actix_service::*",
"actix_utils::*",
"tracing::*",
"tracing_futures::*",
]
allowed_external_types = ["actix_service::*", "actix_utils::*", "tracing::*", "tracing_futures::*"]
[dependencies]
actix-service = "2"
actix-utils = "3"
tracing = "0.1.35"
tracing-futures = "0.2"
[dev-dependencies]
actix-rt = "2"
slab = "0.4"
[lints]
workspace = true

4
actix-tracing/src/lib.rs
View File

@ -1,7 +1,5 @@
//! Actix tracing - support for tokio tracing with Actix services.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
@ -22,6 +20,7 @@ pub struct TracingService<S, F> {
}
impl<S, F> TracingService<S, F> {
/// Constructs new tracing middleware.
pub fn new(inner: S, make_span: F) -> Self {
TracingService { inner, make_span }
}
@ -63,6 +62,7 @@ pub struct TracingTransform<S, U, F> {
}
impl<S, U, F> TracingTransform<S, U, F> {
/// Constructs new tracing middleware.
pub fn new(make_span: F) -> Self {
TracingTransform {
make_span,

10
actix-utils/Cargo.toml
View File

@ -1,10 +1,7 @@
[package]
name = "actix-utils"
version = "3.0.1"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
description = "Various utilities used in the Actix ecosystem"
keywords = ["network", "framework", "async", "futures"]
categories = ["network-programming", "asynchronous"]
@ -14,10 +11,13 @@ edition.workspace = true
rust-version.workspace = true
[dependencies]
pin-project-lite = "0.2"
local-waker = "0.1"
pin-project-lite = "0.2"
[dev-dependencies]
actix-rt = "2"
futures-util = { version = "0.3.17", default-features = false }
static_assertions = "1.1"
[lints]
workspace = true

2
actix-utils/src/lib.rs
View File

@ -1,7 +1,5 @@
//! Various utilities used in the Actix ecosystem.
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

13
bytestring/Cargo.toml
View File

@ -2,10 +2,7 @@
name = "bytestring"
version = "1.4.0"
description = "A UTF-8 encoded read-only string using `Bytes` as storage"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
keywords = ["string", "bytes", "utf8", "web", "bytestring"]
categories = ["no-std", "web-programming"]
homepage = "https://actix.rs"
@ -15,10 +12,7 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"bytes::*",
"serde::*",
]
allowed_external_types = ["bytes::*", "serde::*"]
[dependencies]
bytes = { version = "1.2", default-features = false }
@ -28,3 +22,6 @@ serde = { version = "1", optional = true }
ahash = { version = "0.8", default-features = false }
serde_json = "1"
static_assertions = "1.1"
[lints]
workspace = true

2
bytestring/src/lib.rs
View File

@ -3,8 +3,6 @@
//! See docs for [`ByteString`].
#![no_std]
#![deny(rust_2018_idioms, nonstandard_style)]
#![warn(future_incompatible, missing_docs)]
extern crate alloc;

10
local-channel/Cargo.toml
View File

@ -2,10 +2,7 @@
name = "local-channel"
version = "0.1.5"
description = "A non-threadsafe multi-producer, single-consumer, futures-aware, FIFO queue"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
repository = "https://github.com/actix/actix-net"
keywords = ["channel", "local", "futures"]
license.workspace = true
@ -13,10 +10,7 @@ edition.workspace = true
rust-version.workspace = true
[package.metadata.cargo_check_external_types]
allowed_external_types = [
"futures_core::*",
"futures_sink::*",
]
allowed_external_types = ["futures_core::*", "futures_sink::*"]
[dependencies]
futures-core = "0.3.17"

5
local-waker/Cargo.toml
View File

@ -2,10 +2,7 @@
name = "local-waker"
version = "0.1.4"
description = "A synchronization primitive for thread-local task wakeup"
authors = [
"Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>",
]
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Rob Ede <robjtede@icloud.com>"]
repository = "https://github.com/actix/actix-net"
keywords = ["waker", "local", "futures", "no-std"]
categories = ["asynchronous", "no-std"]