Merge #450

bors[bot] · Dirbaio · web-flow · commit e46e2310adc8 · 2022-08-12T00:27:50.000Z
450: Fix CI compiletest breakage due to Rust 1.63 r=adamgreig a=Dirbaio



Co-authored-by: Dario Nieuwenhuis &lt;dirbaio@dirbaio.net&gt;
diff --git a/cortex-m-rt/tests/compile-fail/non-static-resource.rs b/cortex-m-rt/tests/compile-fail/non-static-resource.rs
@@ -21,15 +21,15 @@ fn SVCall() {
     static mut STAT: u8 = 0;
 
     let _stat: &'static mut u8 = STAT;
-    //~^ ERROR lifetime of reference outlives lifetime of borrowed content
+    //~^ ERROR lifetime may not live long enough
 }
 
 #[interrupt]
 fn UART0() {
     static mut STAT: u8 = 0;
 
     let _stat: &'static mut u8 = STAT;
-    //~^ ERROR lifetime of reference outlives lifetime of borrowed content
+    //~^ ERROR lifetime may not live long enough
 }
 
 #[entry]

Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ fn SVCall() {`
`21`	`21`	`static mut STAT: u8 = 0;`
`22`	`22`
`23`	`23`	`let _stat: &'static mut u8 = STAT;`
`24`		`- //~^ ERROR lifetime of reference outlives lifetime of borrowed content`
	`24`	`+ //~^ ERROR lifetime may not live long enough`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`#[interrupt]`
`28`	`28`	`fn UART0() {`
`29`	`29`	`static mut STAT: u8 = 0;`
`30`	`30`
`31`	`31`	`let _stat: &'static mut u8 = STAT;`
`32`		`- //~^ ERROR lifetime of reference outlives lifetime of borrowed content`
	`32`	`+ //~^ ERROR lifetime may not live long enough`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`#[entry]`