Merge pull request #3509 from matrix-org/jplatte/unexpected-cfgs

Configure unexpected-cfgs via Cargo.toml instead of build scripts

.github/workflows/benchmarks.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Install Rust
       uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: nightly-2024-05-09
+        toolchain: nightly-2024-05-19
         components: rustfmt
 
     - name: Run Benchmarks

.github/workflows/ci.yml

@@ -279,7 +279,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2024-05-09
+          toolchain: nightly-2024-05-19
           components: rustfmt
 
       - name: Cargo fmt
@@ -316,7 +316,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2024-05-09
+          toolchain: nightly-2024-05-19
           components: clippy
 
       - name: Load cache

.github/workflows/documentation.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2024-05-09
+          toolchain: nightly-2024-05-19
 
       - name: Install Node.js
         uses: actions/setup-node@v4

Cargo.toml

@@ -113,6 +113,9 @@ opt-level = 3
 async-compat = { git = "https://github.com/jplatte/async-compat", rev = "16dc8597ec09a6102d58d4e7b67714a35dd0ecb8" }
 const_panic = { git = "https://github.com/jplatte/const_panic", rev = "9024a4cb3eac45c1d2d980f17aaee287b17be498" }
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
+
 [workspace.lints.clippy]
 assigning_clones = "allow"
 box_default = "allow"

crates/matrix-sdk-base/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    // Prevent unnecessary rerunning of this build script
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-}

crates/matrix-sdk-common/build.rs

@@ -4,9 +4,6 @@ fn main() {
     // Prevent unnecessary rerunning of this build script
     println!("cargo:rerun-if-changed=build.rs");
 
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-
     let is_wasm = env::var_os("CARGO_CFG_TARGET_ARCH").is_some_and(|arch| arch == "wasm32");
     if is_wasm && env::var_os("CARGO_FEATURE_JS").is_none() {
         eprintln!(

crates/matrix-sdk-crypto/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    // Prevent unnecessary rerunning of this build script
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-}

crates/matrix-sdk-indexeddb/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    // Prevent unnecessary rerunning of this build script
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-}

crates/matrix-sdk-sqlite/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    // Prevent unnecessary rerunning of this build script
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-}

crates/matrix-sdk-ui/build.rs

@@ -1,7 +0,0 @@
-fn main() {
-    // Prevent unnecessary rerunning of this build script
-    println!("cargo:rerun-if-changed=build.rs");
-
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-}

crates/matrix-sdk/build.rs

@@ -22,9 +22,6 @@ fn main() {
     // Prevent unnecessary rerunning of this build script
     println!("cargo:rerun-if-changed=build.rs");
 
-    // Prevent nightly CI from erroring on tarpaulin_include attribute
-    println!("cargo:rustc-check-cfg=cfg(tarpaulin_include)");
-
     let native_tls_set = env_is_set("CARGO_FEATURE_NATIVE_TLS");
     let rustls_tls_set = env_is_set("CARGO_FEATURE_RUSTLS_TLS");
     ensure(

xtask/src/main.rs

@@ -11,7 +11,7 @@ use kotlin::KotlinArgs;
 use swift::SwiftArgs;
 use xshell::cmd;
 
-const NIGHTLY: &str = "nightly-2024-05-09";
+const NIGHTLY: &str = "nightly-2024-05-19";
 
 type Result<T, E = Box<dyn std::error::Error>> = std::result::Result<T, E>;