srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Update Rust to 1.26.0.

This commit is contained in:
whitequark 2018-05-15 12:47:51 +00:00
parent 26faaad2b7
commit 514eab3d39
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/firmware/ksupport/eh.rs
View File

@ -398,7 +398,7 @@ static mut INFLIGHT: ExceptionInfo = ExceptionInfo {
}; };
#[export_name="__artiq_raise"] #[export_name="__artiq_raise"]
#[unwind] #[unwind(allowed)]
pub unsafe extern fn raise(exception: *const Exception) -> ! { pub unsafe extern fn raise(exception: *const Exception) -> ! {
// Zing! The Exception<'a> to Exception<'static> transmute is not really sound in case // 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 // 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"] #[export_name="__artiq_reraise"]
#[unwind] #[unwind(allowed)]
pub unsafe extern fn reraise() -> ! { pub unsafe extern fn reraise() -> ! {
if INFLIGHT.handled { if INFLIGHT.handled {
raise(&INFLIGHT.exception.unwrap()) raise(&INFLIGHT.exception.unwrap())

6
artiq/firmware/runtime/profiler.rs
View File

@ -2,16 +2,16 @@
use core::mem; use core::mem;
use core::fmt; use core::fmt;
use core::nonzero::NonZero; use core::num::NonZeroUsize;
use alloc::Vec; use alloc::Vec;
use managed::ManagedMap; use managed::ManagedMap;
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub struct Address(NonZero<usize>); pub struct Address(NonZeroUsize);
impl Address { impl Address {
pub fn new(raw: usize) -> Option<Address> { pub fn new(raw: usize) -> Option<Address> {
NonZero::new(raw).map(Address) NonZeroUsize::new(raw).map(Address)
} }
pub fn as_raw(&self) -> usize { pub fn as_raw(&self) -> usize {

2
conda/artiq-dev/meta.yaml
View File

@ -21,7 +21,7 @@ requirements:
- binutils-or1k-linux >=2.27 - binutils-or1k-linux >=2.27
- llvm-or1k 6.0.0 - llvm-or1k 6.0.0
- llvmlite-artiq 0.23.0.dev py35_4 - 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 - openocd 0.10.0 6
- lit - lit
- outputcheck - outputcheck