forked from M-Labs/artiq
Update Rust to 1.26.0.
This commit is contained in:
parent
26faaad2b7
commit
514eab3d39
|
@ -398,7 +398,7 @@ static mut INFLIGHT: ExceptionInfo = ExceptionInfo {
|
|||
};
|
||||
|
||||
#[export_name="__artiq_raise"]
|
||||
#[unwind]
|
||||
#[unwind(allowed)]
|
||||
pub unsafe extern fn raise(exception: *const Exception) -> ! {
|
||||
// Zing! The Exception<'a> to Exception<'static> transmute is not really sound in case
|
||||
// the exception is ever captured. Fortunately, they currently aren't, and we save
|
||||
|
@ -416,7 +416,7 @@ pub unsafe extern fn raise(exception: *const Exception) -> ! {
|
|||
}
|
||||
|
||||
#[export_name="__artiq_reraise"]
|
||||
#[unwind]
|
||||
#[unwind(allowed)]
|
||||
pub unsafe extern fn reraise() -> ! {
|
||||
if INFLIGHT.handled {
|
||||
raise(&INFLIGHT.exception.unwrap())
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
use core::mem;
|
||||
use core::fmt;
|
||||
use core::nonzero::NonZero;
|
||||
use core::num::NonZeroUsize;
|
||||
use alloc::Vec;
|
||||
use managed::ManagedMap;
|
||||
|
||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
|
||||
pub struct Address(NonZero<usize>);
|
||||
pub struct Address(NonZeroUsize);
|
||||
|
||||
impl Address {
|
||||
pub fn new(raw: usize) -> Option<Address> {
|
||||
NonZero::new(raw).map(Address)
|
||||
NonZeroUsize::new(raw).map(Address)
|
||||
}
|
||||
|
||||
pub fn as_raw(&self) -> usize {
|
||||
|
|
|
@ -21,7 +21,7 @@ requirements:
|
|||
- binutils-or1k-linux >=2.27
|
||||
- llvm-or1k 6.0.0
|
||||
- llvmlite-artiq 0.23.0.dev py35_4
|
||||
- rust-core-or1k 1.25.0 20
|
||||
- rust-core-or1k 1.26.0 21
|
||||
- openocd 0.10.0 6
|
||||
- lit
|
||||
- outputcheck
|
||||
|
|
Loading…
Reference in New Issue