Skip to content

Commit 25e9094

Browse files
authored
Leftover nightly fixes (#5077)
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.
1 parent b935818 commit 25e9094

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

ffi/freertos/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ default = ["icu_capi/default_components"]
4343

4444
[build-dependencies]
4545
rustc_version = "0.4"
46+
47+
[lints.rust]
48+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(needs_alloc_error_handler)'] }

ffi/freertos/build.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ fn needs_alloc_error_handler() -> Option<bool> {
2727
}
2828

2929
fn main() {
30+
println!("cargo:rustc-check-cfg=cfg(needs_alloc_error_handler)");
31+
3032
match env::var("CARGO_CFG_TARGET_OS") {
3133
Ok(v) if v == "none" => (),
3234
// Only on target_os = none
3335
_ => return,
3436
};
35-
3637
if let Some(true) = needs_alloc_error_handler() {
3738
println!("cargo:rustc-cfg=needs_alloc_error_handler");
3839
}

provider/datagen/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ macro_rules! cb {
130130
/// corresponding Cargo features has been enabled.
131131
// Excludes the hello world marker, as that generally should not be generated.
132132
pub fn all_markers() -> Vec<DataMarkerInfo> {
133-
#[cfg(features = "experimental_components")]
133+
#[cfg(feature = "experimental_components")]
134134
log::warn!("The icu_datagen crates has been built with the `experimental_components` feature, so `all_markers` returns experimental markers");
135135
vec![
136136
$(

0 commit comments

Comments
 (0)