diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a05dc37e1..f6f0705bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -68,7 +68,7 @@ test nightly: <<: *cargo_test rustfmt: - image: "rustlang/rust:nightly-slim" + image: "rust:slim" stage: "lint" script: - rustup component add rustfmt diff --git a/.rustfmt.toml b/.rustfmt.toml deleted file mode 100644 index 70ca331a2..000000000 --- a/.rustfmt.toml +++ /dev/null @@ -1,17 +0,0 @@ -ignore = [ - "gstreamer/src/auto", - "gstreamer-app/src/auto", - "gstreamer-audio/src/auto", - "gstreamer-base/src/auto", - "gstreamer-check/src/auto", - "gstreamer-net/src/auto", - "gstreamer-pbutils/src/auto", - "gstreamer-player/src/auto", - "gstreamer-rtsp/src/auto", - "gstreamer-rtsp-server/src/auto", - "gstreamer-sdp/src/auto", - "gstreamer-video/src/auto", - "gstreamer-webrtc/src/auto", - "gstreamer-editing-services/src/auto", - "gstreamer-gl/src/auto", -] diff --git a/gstreamer-app/src/lib.rs b/gstreamer-app/src/lib.rs index b59fc1323..ace619f84 100644 --- a/gstreamer-app/src/lib.rs +++ b/gstreamer-app/src/lib.rs @@ -29,6 +29,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index a01ebd87b..e82689bc1 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -36,6 +36,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-base/src/lib.rs b/gstreamer-base/src/lib.rs index 96cd9344f..6338741b0 100644 --- a/gstreamer-base/src/lib.rs +++ b/gstreamer-base/src/lib.rs @@ -33,6 +33,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] +#[rustfmt::skip] mod auto; pub use auto::functions::*; pub use auto::*; diff --git a/gstreamer-check/src/lib.rs b/gstreamer-check/src/lib.rs index 955d78e1b..fd93c76ec 100644 --- a/gstreamer-check/src/lib.rs +++ b/gstreamer-check/src/lib.rs @@ -30,6 +30,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-editing-services/src/lib.rs b/gstreamer-editing-services/src/lib.rs index 0c0e3e62e..b44d1dbb3 100644 --- a/gstreamer-editing-services/src/lib.rs +++ b/gstreamer-editing-services/src/lib.rs @@ -70,6 +70,7 @@ macro_rules! skip_assert_initialized { #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-gl/src/lib.rs b/gstreamer-gl/src/lib.rs index f4dab7f3b..82fd4c958 100644 --- a/gstreamer-gl/src/lib.rs +++ b/gstreamer-gl/src/lib.rs @@ -42,6 +42,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-net/src/lib.rs b/gstreamer-net/src/lib.rs index a2b5f980b..b5652f48d 100644 --- a/gstreamer-net/src/lib.rs +++ b/gstreamer-net/src/lib.rs @@ -29,6 +29,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; mod net_client_clock; diff --git a/gstreamer-pbutils/src/lib.rs b/gstreamer-pbutils/src/lib.rs index 1bafdf23c..d1277ec1a 100644 --- a/gstreamer-pbutils/src/lib.rs +++ b/gstreamer-pbutils/src/lib.rs @@ -44,6 +44,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] +#[rustfmt::skip] mod auto; pub use auto::functions::*; pub use auto::*; diff --git a/gstreamer-player/src/lib.rs b/gstreamer-player/src/lib.rs index 470743333..29dc1d082 100644 --- a/gstreamer-player/src/lib.rs +++ b/gstreamer-player/src/lib.rs @@ -34,6 +34,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] #[cfg_attr(feature = "cargo-clippy", allow(useless_transmute))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-rtsp-server/src/lib.rs b/gstreamer-rtsp-server/src/lib.rs index fee1a37a2..9a42e2491 100644 --- a/gstreamer-rtsp-server/src/lib.rs +++ b/gstreamer-rtsp-server/src/lib.rs @@ -47,6 +47,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-rtsp/src/lib.rs b/gstreamer-rtsp/src/lib.rs index 85b593c9c..8a999c92b 100644 --- a/gstreamer-rtsp/src/lib.rs +++ b/gstreamer-rtsp/src/lib.rs @@ -38,6 +38,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-sdp/src/lib.rs b/gstreamer-sdp/src/lib.rs index 2c67f49f6..4d1367d17 100644 --- a/gstreamer-sdp/src/lib.rs +++ b/gstreamer-sdp/src/lib.rs @@ -36,6 +36,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[allow(non_snake_case)] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-video/src/lib.rs b/gstreamer-video/src/lib.rs index 50dac87aa..cf7365e93 100644 --- a/gstreamer-video/src/lib.rs +++ b/gstreamer-video/src/lib.rs @@ -39,6 +39,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer-webrtc/src/lib.rs b/gstreamer-webrtc/src/lib.rs index be44a6fc0..b26a77a22 100644 --- a/gstreamer-webrtc/src/lib.rs +++ b/gstreamer-webrtc/src/lib.rs @@ -35,6 +35,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(transmute_ptr_to_ref))] #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] +#[rustfmt::skip] mod auto; pub use auto::*; diff --git a/gstreamer/src/lib.rs b/gstreamer/src/lib.rs index 4b32fff33..ee7cdaa3a 100644 --- a/gstreamer/src/lib.rs +++ b/gstreamer/src/lib.rs @@ -64,6 +64,7 @@ pub use glib::{Cast, Continue, Error, IsA, StaticType, ToValue, Type, TypedValue #[cfg_attr(feature = "cargo-clippy", allow(too_many_arguments))] #[cfg_attr(feature = "cargo-clippy", allow(match_same_arms))] #[cfg_attr(feature = "cargo-clippy", allow(type_complexity))] +#[rustfmt::skip] mod auto; pub use auto::functions::*; pub use auto::*;