diff --git a/.cargo/config.toml b/.cargo/config.toml index 0e39c8fd..b71ad165 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,3 @@ [build] -rustflags = ["-Zthreads=8", "-Zshare-generics=y"] +# The nightly global next solver exceeds CI memory on synctv-api-http; see rust-lang/rust#161748. +rustflags = ["-Zthreads=8", "-Zshare-generics=y", "-Znext-solver=coherence"] diff --git a/synctv-api-common/src/lib.rs b/synctv-api-common/src/lib.rs index 7abc2a49..ef451e37 100644 --- a/synctv-api-common/src/lib.rs +++ b/synctv-api-common/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - #[cfg(all(feature = "tls-aws-lc", feature = "tls-ring"))] compile_error!("features \"tls-aws-lc\" and \"tls-ring\" are mutually exclusive - use only one"); diff --git a/synctv-api-grpc/src/lib.rs b/synctv-api-grpc/src/lib.rs index 535b22e2..e8747f11 100644 --- a/synctv-api-grpc/src/lib.rs +++ b/synctv-api-grpc/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - pub mod grpc; pub mod grpc_support; pub(crate) mod providers; diff --git a/synctv-api-http/src/lib.rs b/synctv-api-http/src/lib.rs index e6b43738..9fce5012 100644 --- a/synctv-api-http/src/lib.rs +++ b/synctv-api-http/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - pub mod http; #[cfg(feature = "openapi")] pub mod openapi; diff --git a/synctv-core/src/lib.rs b/synctv-core/src/lib.rs index 9e742351..3e047fdf 100644 --- a/synctv-core/src/lib.rs +++ b/synctv-core/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - #[cfg(all(feature = "tls-aws-lc", feature = "tls-ring"))] compile_error!("features \"tls-aws-lc\" and \"tls-ring\" are mutually exclusive - use only one"); diff --git a/synctv-proxy/tests/slice_cache_tests.rs b/synctv-proxy/tests/slice_cache_tests.rs index 25dd86e3..5762242b 100644 --- a/synctv-proxy/tests/slice_cache_tests.rs +++ b/synctv-proxy/tests/slice_cache_tests.rs @@ -1,6 +1,5 @@ //! Tests for the SliceCache range-request caching system. -#![recursion_limit = "256"] #![allow(clippy::unwrap_used)] use std::collections::HashMap; diff --git a/synctv/src/lib.rs b/synctv/src/lib.rs index 2014ed64..ca8f0a98 100644 --- a/synctv/src/lib.rs +++ b/synctv/src/lib.rs @@ -1,5 +1,3 @@ -#![recursion_limit = "256"] - //! SyncTV server library. //! //! This crate provides the main server implementation for SyncTV. diff --git a/synctv/tests/full_stack_e2e_tests.rs b/synctv/tests/full_stack_e2e_tests.rs index a4f21016..6fc1cdec 100644 --- a/synctv/tests/full_stack_e2e_tests.rs +++ b/synctv/tests/full_stack_e2e_tests.rs @@ -1,4 +1,3 @@ -#![recursion_limit = "256"] #![allow(clippy::unwrap_used)] use std::collections::HashMap;