forked from M-Labs/artiq
runtime: update rust alloc, managed
This commit is contained in:
parent
e99061b013
commit
c800b6c8d3
|
@ -18,7 +18,7 @@ failure_derive = { version = "0.1", default-features = false }
|
|||
byteorder = { version = "1.0", default-features = false }
|
||||
cslice = { version = "0.3" }
|
||||
log = { version = "0.4", default-features = false }
|
||||
managed = { version = "= 0.7.0", default-features = false, features = ["alloc", "map"] }
|
||||
managed = { version = "^0.7.1", default-features = false, features = ["alloc", "map"] }
|
||||
eh = { path = "../libeh" }
|
||||
unwind_backtrace = { path = "../libunwind_backtrace" }
|
||||
io = { path = "../libio", features = ["byteorder"] }
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use alloc::{Vec, String, BTreeMap};
|
||||
use alloc::{vec::Vec, string::String, collections::btree_map::BTreeMap};
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Entry {
|
||||
|
|
|
@ -147,7 +147,7 @@ fn startup() {
|
|||
};
|
||||
|
||||
let neighbor_cache =
|
||||
smoltcp::iface::NeighborCache::new(alloc::btree_map::BTreeMap::new());
|
||||
smoltcp::iface::NeighborCache::new(alloc::collections::btree_map::BTreeMap::new());
|
||||
let net_addresses = net_settings::get_adresses();
|
||||
info!("network addresses: {}", net_addresses);
|
||||
let mut interface = match net_addresses.ipv6_addr {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use alloc::btree_map::BTreeMap;
|
||||
use alloc::collections::btree_map::BTreeMap;
|
||||
use core::cell::RefCell;
|
||||
|
||||
use io::Error as IoError;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use core::mem;
|
||||
use alloc::{Vec, String, BTreeMap};
|
||||
use alloc::{vec::Vec, string::String, collections::btree_map::BTreeMap};
|
||||
|
||||
const ALIGNMENT: usize = 64;
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use core::mem;
|
||||
use core::result;
|
||||
use core::cell::{Cell, RefCell};
|
||||
use alloc::Vec;
|
||||
use alloc::vec::Vec;
|
||||
use fringe::OwnedStack;
|
||||
use fringe::generator::{Generator, Yielder, State as GeneratorState};
|
||||
use smoltcp::time::Duration;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use core::{mem, str, cell::{Cell, RefCell}, fmt::Write as FmtWrite};
|
||||
use alloc::{Vec, String};
|
||||
use alloc::{vec::Vec, string::String};
|
||||
use byteorder::{ByteOrder, NetworkEndian};
|
||||
|
||||
use io::{Read, Write, Error as IoError};
|
||||
|
|
Loading…
Reference in New Issue