Skip to content

Commit f1663ab

Browse files
authored
Merge pull request #244 from therealprof/features/fix-nightly-build
Address build failures on nightly due to lint
2 parents 77ce4d5 + 82c340e commit f1663ab

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/generate/device.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ pub fn render(d: &Device, target: &Target, nightly: bool, device_x: &mut String)
173173
// NOTE `no_mangle` is used here to prevent linking different minor versions of the device
174174
// crate as that would let you `take` the device peripherals more than once (one per minor
175175
// version)
176+
#[allow(renamed_and_removed_lints)]
177+
// This currently breaks on nightly, to be removed with the line above once 1.31 is stable
176178
#[allow(private_no_mangle_statics)]
177179
#[no_mangle]
178180
static mut DEVICE_PERIPHERALS: bool = false;

src/generate/interrupt.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ pub fn render(
193193
_reserved: u32,
194194
}
195195

196+
#[allow(renamed_and_removed_lints)]
197+
// This currently breaks on nightly, to be removed with the line above once 1.31 is stable
196198
#[allow(private_no_mangle_statics)]
197199
#[cfg(feature = "rt")]
198200
#[doc(hidden)]
@@ -318,7 +320,7 @@ pub fn render(
318320

319321
if *target != Target::CortexM {
320322
root.push(quote! {
321-
pub use interrupt::Interrupt;
323+
pub use self::interrupt::Interrupt;
322324
});
323325
}
324326
}

0 commit comments

Comments
 (0)