From 4e43216b99a4928551dddd491173de4be32c02f7 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 12 Dec 2020 23:24:00 +0000 Subject: [PATCH] standardise compiler lints across all crates (#226) --- actix-codec/src/lib.rs | 4 +++- actix-connect/src/lib.rs | 4 +++- actix-macros/src/lib.rs | 5 ++++- actix-rt/src/lib.rs | 4 +++- actix-server/src/lib.rs | 4 +++- actix-service/src/lib.rs | 4 +++- actix-testing/src/lib.rs | 5 ++++- actix-threadpool/src/lib.rs | 4 ++++ actix-tls/src/lib.rs | 4 +++- actix-tracing/src/lib.rs | 5 ++++- actix-utils/src/lib.rs | 4 +++- router/src/de.rs | 2 +- router/src/lib.rs | 4 ++++ router/src/path.rs | 2 +- string/src/lib.rs | 8 ++++++-- 15 files changed, 49 insertions(+), 14 deletions(-) diff --git a/actix-codec/src/lib.rs b/actix-codec/src/lib.rs index d972763e..07939549 100644 --- a/actix-codec/src/lib.rs +++ b/actix-codec/src/lib.rs @@ -9,8 +9,10 @@ //! [`Sink`]: futures_sink::Sink //! [`Stream`]: futures_core::Stream -#![deny(rust_2018_idioms)] +#![deny(rust_2018_idioms, nonstandard_style)] #![warn(missing_docs)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] mod bcodec; mod framed; diff --git a/actix-connect/src/lib.rs b/actix-connect/src/lib.rs index ea6d7ab8..36d0b98a 100644 --- a/actix-connect/src/lib.rs +++ b/actix-connect/src/lib.rs @@ -5,8 +5,10 @@ //! * `openssl` - enables TLS support via `openssl` crate //! * `rustls` - enables TLS support via `rustls` crate -#![deny(rust_2018_idioms)] +#![deny(rust_2018_idioms, nonstandard_style)] #![recursion_limit = "128"] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #[macro_use] extern crate log; diff --git a/actix-macros/src/lib.rs b/actix-macros/src/lib.rs index e4baa15b..fc655a64 100644 --- a/actix-macros/src/lib.rs +++ b/actix-macros/src/lib.rs @@ -1,5 +1,8 @@ //! Macros for use with Tokio -extern crate proc_macro; + +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] use proc_macro::TokenStream; use quote::quote; diff --git a/actix-rt/src/lib.rs b/actix-rt/src/lib.rs index ad76929c..dccd9202 100644 --- a/actix-rt/src/lib.rs +++ b/actix-rt/src/lib.rs @@ -1,6 +1,8 @@ //! A runtime implementation that runs everything on the current thread. -#![deny(rust_2018_idioms, warnings)] +#![deny(rust_2018_idioms, nonstandard_style)] #![allow(clippy::type_complexity)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] #[cfg(not(test))] // Work around for rust-lang/rust#62127 pub use actix_macros::{main, test}; diff --git a/actix-server/src/lib.rs b/actix-server/src/lib.rs index 8efc29d3..d7a7c242 100644 --- a/actix-server/src/lib.rs +++ b/actix-server/src/lib.rs @@ -1,6 +1,8 @@ //! General purpose TCP server. -#![deny(rust_2018_idioms)] +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] mod accept; mod builder; diff --git a/actix-service/src/lib.rs b/actix-service/src/lib.rs index fd09184c..b25a6f98 100644 --- a/actix-service/src/lib.rs +++ b/actix-service/src/lib.rs @@ -1,7 +1,9 @@ //! See [`Service`](trait.Service.html) docs for information on this crate's foundational trait. -#![deny(rust_2018_idioms, warnings)] +#![deny(rust_2018_idioms, nonstandard_style)] #![allow(clippy::type_complexity)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] use std::cell::RefCell; use std::future::Future; diff --git a/actix-testing/src/lib.rs b/actix-testing/src/lib.rs index 3ec81061..efcdd394 100644 --- a/actix-testing/src/lib.rs +++ b/actix-testing/src/lib.rs @@ -1,6 +1,9 @@ //! Various helpers for Actix applications to use during testing. -#![deny(rust_2018_idioms, warnings)] + +#![deny(rust_2018_idioms, nonstandard_style)] #![allow(clippy::type_complexity, clippy::needless_doctest_main)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] use std::sync::mpsc; use std::{net, thread}; diff --git a/actix-threadpool/src/lib.rs b/actix-threadpool/src/lib.rs index 08b563ef..2fda28ef 100644 --- a/actix-threadpool/src/lib.rs +++ b/actix-threadpool/src/lib.rs @@ -1,5 +1,9 @@ //! Thread pool for blocking operations +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] + use std::fmt; use std::future::Future; use std::pin::Pin; diff --git a/actix-tls/src/lib.rs b/actix-tls/src/lib.rs index 5613c5f2..8cc18046 100644 --- a/actix-tls/src/lib.rs +++ b/actix-tls/src/lib.rs @@ -5,7 +5,9 @@ //! * `rustls` - TLS acceptor using the `rustls` crate. //! * `nativetls` - TLS acceptor using the `native-tls` crate. -#![deny(rust_2018_idioms)] +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/actix-tracing/src/lib.rs b/actix-tracing/src/lib.rs index 35c85286..c011790b 100644 --- a/actix-tracing/src/lib.rs +++ b/actix-tracing/src/lib.rs @@ -1,5 +1,8 @@ //! Actix tracing - support for tokio tracing with Actix services. -#![deny(rust_2018_idioms, warnings)] + +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] use std::marker::PhantomData; use std::task::{Context, Poll}; diff --git a/actix-utils/src/lib.rs b/actix-utils/src/lib.rs index 7fde1f59..19df225b 100644 --- a/actix-utils/src/lib.rs +++ b/actix-utils/src/lib.rs @@ -1,7 +1,9 @@ //! Actix utils - various helper services -#![deny(rust_2018_idioms)] +#![deny(rust_2018_idioms, nonstandard_style)] #![allow(clippy::type_complexity)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] pub mod condition; pub mod counter; diff --git a/router/src/de.rs b/router/src/de.rs index ce29d2af..81796348 100644 --- a/router/src/de.rs +++ b/router/src/de.rs @@ -42,7 +42,7 @@ macro_rules! parse_single_value { }; } -pub struct PathDeserializer<'de, T: ResourcePath + 'de> { +pub struct PathDeserializer<'de, T: ResourcePath> { path: &'de Path, } diff --git a/router/src/lib.rs b/router/src/lib.rs index e141d667..5850b103 100644 --- a/router/src/lib.rs +++ b/router/src/lib.rs @@ -1,5 +1,9 @@ //! Resource path matching library. +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] + mod de; mod path; mod resource; diff --git a/router/src/path.rs b/router/src/path.rs index 0e13c37a..0998c614 100644 --- a/router/src/path.rs +++ b/router/src/path.rs @@ -158,7 +158,7 @@ impl Path { } /// Return iterator to items in parameter container - pub fn iter(&self) -> PathIter { + pub fn iter(&self) -> PathIter<'_, T> { PathIter { idx: 0, params: self, diff --git a/string/src/lib.rs b/string/src/lib.rs index dd89399b..553c8634 100644 --- a/string/src/lib.rs +++ b/string/src/lib.rs @@ -1,5 +1,9 @@ //! A UTF-8 encoded read-only string using Bytes as storage. +#![deny(rust_2018_idioms, nonstandard_style)] +#![doc(html_logo_url = "https://actix.rs/img/logo.png")] +#![doc(html_favicon_url = "https://actix.rs/favicon.ico")] + use std::convert::TryFrom; use std::{borrow, fmt, hash, ops, str}; @@ -156,13 +160,13 @@ macro_rules! array_impls { array_impls!(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16); impl fmt::Debug for ByteString { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { (**self).fmt(fmt) } } impl fmt::Display for ByteString { - fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { (**self).fmt(fmt) } }