Skip to content

Commit

Permalink
Leftover nightly fixes (#5077)
Browse files Browse the repository at this point in the history
The displaydoc warnings need
yaahc/displaydoc#47, but I don't think they
break non-clippy CI for us, and I'm working on getting that published.
  • Loading branch information
Manishearth authored Jun 19, 2024
1 parent b935818 commit 25e9094
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
3 changes: 3 additions & 0 deletions ffi/freertos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ default = ["icu_capi/default_components"]

[build-dependencies]
rustc_version = "0.4"

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(needs_alloc_error_handler)'] }
3 changes: 2 additions & 1 deletion ffi/freertos/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,13 @@ fn needs_alloc_error_handler() -> Option<bool> {
}

fn main() {
println!("cargo:rustc-check-cfg=cfg(needs_alloc_error_handler)");

match env::var("CARGO_CFG_TARGET_OS") {
Ok(v) if v == "none" => (),
// Only on target_os = none
_ => return,
};

if let Some(true) = needs_alloc_error_handler() {
println!("cargo:rustc-cfg=needs_alloc_error_handler");
}
Expand Down
2 changes: 1 addition & 1 deletion provider/datagen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ macro_rules! cb {
/// corresponding Cargo features has been enabled.
// Excludes the hello world marker, as that generally should not be generated.
pub fn all_markers() -> Vec<DataMarkerInfo> {
#[cfg(features = "experimental_components")]
#[cfg(feature = "experimental_components")]
log::warn!("The icu_datagen crates has been built with the `experimental_components` feature, so `all_markers` returns experimental markers");
vec![
$(
Expand Down

0 comments on commit 25e9094

Please sign in to comment.