forked from M-Labs/artiq
1
0
Fork 0

runtime: update rust alloc, managed

This commit is contained in:
occheung 2021-08-06 11:07:47 +08:00
parent e99061b013
commit c800b6c8d3
7 changed files with 7 additions and 7 deletions

View File

@ -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"] }

View File

@ -1,4 +1,4 @@
use alloc::{Vec, String, BTreeMap};
use alloc::{vec::Vec, string::String, collections::btree_map::BTreeMap};
#[derive(Debug)]
struct Entry {

View File

@ -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 {

View File

@ -1,4 +1,4 @@
use alloc::btree_map::BTreeMap;
use alloc::collections::btree_map::BTreeMap;
use core::cell::RefCell;
use io::Error as IoError;

View File

@ -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;

View File

@ -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;

View File

@ -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};