Define expected cfgs for Cargo builds

Summary: Context: see https://blog.rust-lang.org/2024/07/25/Rust-1.80.0.html#checked-cfg-names-and-values Warnings from `#[cfg(fbcode_build)]` was one of the common issues causing Cargo-based CI jobs to fail in {D60317004}. From **sapling-oss-unix**: ```lang=text,counterexample warning: unexpected `cfg` condition name: `fbcode_build` --> /data/sandcastle/boxes/eden-trunk-hg-fbcode-fbsource/fbcode/common/rust/shed/hostcaps/src/lib.rs:12:7 | 12 | #[cfg(fbcode_build)] | ^^^^^^^^^^^^ | = help: expected names are: `clippy`, `debug_assertions`, `doc`, `docsrs`, `doctest`, `feature`, `miri`, `overflow_checks`, `panic`, `proc_macro`, `relocation_model`, `rustfmt`, `sanitize`, `sanitizer_cfi_generalize_pointers`, `sanitizer_cfi_normalize_integers`, `target_abi`, `target_arch`, `target_endian`, `target_env`, `target_family`, `target_feature`, `target_has_atomic`, `target_has_atomic_equal_alignment`, `target_has_atomic_load_store`, `target_os`, `target_pointer_width`, `target_thread_local`, `target_vendor`, `test`, `ub_checks`, `unix`, and `windows` = help: consider using a Cargo feature instead = help: or consider adding in `Cargo.toml` the `check-cfg` lint config for the lint: [lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fbcode_build)'] } = help: or consider adding `println!("cargo::rustc-check-cfg=cfg(fbcode_build)");` to the top of the `build.rs` = note: see <https://doc.rust-lang.org/.../check-cfg/cargo-specifics.html> for more information about checking conditional configuration = note: `#[warn(unexpected_cfgs)]` on by default ``` I thought about having Autocargo unconditionally emit `check-cfg = ["cfg(fbcode_build)"]` into every generated Cargo.toml, but that's even more noisy and this cfg isn't too widely used to configure one at a time. Reviewed By: diliop Differential Revision: D60706859 fbshipit-source-id: f9a533af46ccc27682b9e1702c61f3838a224c05
facebookexperimental · Aug 5, 2024 · 9d41d25 · 9d41d25
1 parent c26a9d4
commit 9d41d25
Show file tree

Hide file tree

Showing 32 changed files with 191 additions and 0 deletions.
diff --git a/shed/cached_config/BUCK b/shed/cached_config/BUCK
@@ -8,6 +8,14 @@ rust_library(
     srcs = glob(["src/**/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Helpers to maintain cached set of configs",
             },

diff --git a/shed/cached_config/Cargo.toml b/shed/cached_config/Cargo.toml
@@ -23,3 +23,6 @@ tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
 
 [dev-dependencies]
 serde_derive = "1.0.185"
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/cachelib_stub/BUCK b/shed/cachelib_stub/BUCK
@@ -16,6 +16,14 @@ rust_library(
                     "fbsource//third-party/rust:bytes",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Cache library",
             },

diff --git a/shed/cachelib_stub/Cargo.toml b/shed/cachelib_stub/Cargo.toml
@@ -14,3 +14,6 @@ license = "MIT OR Apache-2.0"
 abomonation = { version = "0.7", features = ["smallvec"] }
 anyhow = "1.0.75"
 bytes = { version = "1.6.0", features = ["serde"] }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/failure_ext/BUCK b/shed/failure_ext/BUCK
@@ -8,6 +8,14 @@ rust_library(
     srcs = glob(["src/**/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Extensions to the anyhow crate",
             },

diff --git a/shed/failure_ext/Cargo.toml b/shed/failure_ext/Cargo.toml
@@ -17,3 +17,6 @@ slog = { version = "2.7", features = ["max_level_trace", "nested-values"] }
 
 [dev-dependencies]
 thiserror = "1.0.49"
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/fbinit/BUCK b/shed/fbinit/BUCK
@@ -15,6 +15,14 @@ rust_library(
                     "fbsource//third-party/rust:quickcheck",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Facebook init token",
                 "version": "0.1.2",

diff --git a/shed/fbinit/Cargo.toml b/shed/fbinit/Cargo.toml
@@ -24,3 +24,6 @@ quickcheck = "1.0"
 
 [dev-dependencies]
 fbinit-tokio = { version = "0.1.2", path = "fbinit-tokio" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/hostcaps/BUCK b/shed/hostcaps/BUCK
@@ -8,6 +8,18 @@ oncall("autocargo")
 rust_library(
     name = "hostcaps",
     srcs = glob(["src/**/*.rs"]),
+    autocargo = {
+        "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
+        },
+    },
     crate_root = "src/lib.rs",
     deps = [
         "fbsource//third-party/rust:once_cell",

diff --git a/shed/hostcaps/Cargo.toml b/shed/hostcaps/Cargo.toml
@@ -15,3 +15,6 @@ path = "src/bin/test.rs"
 
 [dependencies]
 once_cell = "1.12"
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/hostname/BUCK b/shed/hostname/BUCK
@@ -14,6 +14,14 @@ rust_library(
                     ("real_hostname", "fbsource//third-party/rust:hostname"),
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Crate for getting hostname",
             },

diff --git a/shed/hostname/Cargo.toml b/shed/hostname/Cargo.toml
@@ -13,3 +13,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 anyhow = "1.0.75"
 real_hostname = { package = "hostname", version = "0.3" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/justknobs_stub/BUCK b/shed/justknobs_stub/BUCK
@@ -9,6 +9,14 @@ rust_library(
     srcs = glob(["src/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Client for accessing JustKnobs. Noop crate for now",
             },

diff --git a/shed/justknobs_stub/Cargo.toml b/shed/justknobs_stub/Cargo.toml
@@ -29,3 +29,6 @@ tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
 fbinit = { version = "0.1.2", path = "../fbinit" }
 maplit = "1.0"
 slog_glog_fmt = { version = "0.1.0", path = "../slog_glog_fmt" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/memcache_stub/BUCK b/shed/memcache_stub/BUCK
@@ -14,6 +14,14 @@ rust_library(
                     ":memcache_common",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Client for accessing Memcache. Noop crate for now",
             },

diff --git a/shed/memcache_stub/Cargo.toml b/shed/memcache_stub/Cargo.toml
@@ -12,3 +12,6 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 memcache_common = { version = "0.1.0", path = "common" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/ods/BUCK b/shed/ods/BUCK
@@ -8,6 +8,14 @@ rust_library(
     srcs = glob(["src/**/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Library that points to meta specific ods for fbcode builds and to the stub for non-fbcode builds",
             },

diff --git a/shed/ods/Cargo.toml b/shed/ods/Cargo.toml
@@ -13,3 +13,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 anyhow = "1.0.75"
 fbinit = { version = "0.1.2", path = "../fbinit" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/panichandler/BUCK b/shed/panichandler/BUCK
@@ -10,6 +10,14 @@ rust_library(
     srcs = glob(["src/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Makes it easier to define a handler for panics",
             },

diff --git a/shed/panichandler/Cargo.toml b/shed/panichandler/Cargo.toml
@@ -52,3 +52,6 @@ libc = "0.2.139"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 libc = "0.2.139"
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/scuba_stub/BUCK b/shed/scuba_stub/BUCK
@@ -14,6 +14,14 @@ rust_library(
                     "//common/rust/shed/scuba_sample:scuba_sample",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Stub for scuba client",
             },

diff --git a/shed/scuba_stub/Cargo.toml b/shed/scuba_stub/Cargo.toml
@@ -12,3 +12,6 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 scuba_sample = { version = "0.1.0", path = "../scuba_sample" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/secure_utils/BUCK b/shed/secure_utils/BUCK
@@ -9,6 +9,14 @@ rust_library(
     srcs = glob(["src/**/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Crate with useful security utilities",
             },

diff --git a/shed/secure_utils/Cargo.toml b/shed/secure_utils/Cargo.toml
@@ -19,3 +19,6 @@ openssl-sys = "0.9.97"
 serde = { version = "1.0.185", features = ["derive", "rc"] }
 serde_json = { version = "1.0.100", features = ["float_roundtrip", "unbounded_depth"] }
 slog = { version = "2.7", features = ["max_level_trace", "nested-values"] }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/services/BUCK b/shed/services/BUCK
@@ -15,6 +15,14 @@ rust_library(
                     "//common/rust/shed/fbinit:fbinit",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Stubs for facebook services",
             },
@@ -38,6 +46,14 @@ rust_library(
     srcs = glob(["common/**/*.rs"]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Common code for stubbed facebook services",
                 "homepage": "https://github.com/facebookexperimental/rust-shed/",

diff --git a/shed/services/Cargo.toml b/shed/services/Cargo.toml
@@ -13,3 +13,6 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 fbinit = { version = "0.1.2", path = "../fbinit" }
 services_common = { version = "0.1.0", path = "common" }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/services/common/Cargo.toml b/shed/services/common/Cargo.toml
@@ -17,3 +17,6 @@ path = "lib.rs"
 [dependencies]
 cxx = "1.0.119"
 thiserror = "1.0.49"
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/sql/BUCK b/shed/sql/BUCK
@@ -20,6 +20,14 @@ rust_library(
                     "mysql_common/default",
                 ],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Crate for accessing sql databases",
             },
@@ -71,6 +79,14 @@ rust_library(
             "features": {
                 "default": ["rusqlite/bundled"],
             },
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Common definitions for sql crate",
                 "readme": "../../../README.md",

diff --git a/shed/sql/Cargo.toml b/shed/sql/Cargo.toml
@@ -30,3 +30,6 @@ tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
 
 [features]
 default = ["mysql_common/chrono", "mysql_common/default"]
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/sql/common/Cargo.toml b/shed/sql/common/Cargo.toml
@@ -36,3 +36,6 @@ sql_tests_lib = { version = "0.1.0", path = "../tests_lib" }
 
 [features]
 default = ["rusqlite/bundled"]
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }
diff --git a/shed/stats/BUCK b/shed/stats/BUCK
@@ -10,6 +10,14 @@ rust_library(
     ]),
     autocargo = {
         "cargo_toml_config": {
+            "lints": {
+                "rust": {
+                    "unexpected_cfgs": {
+                        "check-cfg": ["cfg(fbcode_build)"],
+                        "level": "warn",
+                    },
+                },
+            },
             "package": {
                 "description": "Stats library",
             },

diff --git a/shed/stats/Cargo.toml b/shed/stats/Cargo.toml
@@ -18,3 +18,6 @@ perthread = { version = "0.1.0", path = "../perthread" }
 stats_traits = { version = "0.1.0", path = "traits" }
 tokio = { version = "1.37.0", features = ["full", "test-util", "tracing"] }
 tokio-stream = { version = "0.1.14", features = ["fs", "io-util", "net", "signal", "sync", "time"] }
+
+[lints]
+rust = { unexpected_cfgs = { check-cfg = ["cfg(fbcode_build)"], level = "warn" } }