Remove all remnants of the collections feature.
This commit is contained in:
parent
227139401d
commit
8e13333988
|
@ -1,5 +1,4 @@
|
|||
#![cfg_attr(feature = "alloc", feature(alloc))]
|
||||
#![cfg_attr(feature = "collections", feature(collections))]
|
||||
#![no_std]
|
||||
|
||||
//! The _smoltcp_ library is built in a layered structure, with the layers corresponding
|
||||
|
@ -77,9 +76,6 @@ extern crate std;
|
|||
extern crate libc;
|
||||
#[cfg(feature = "alloc")]
|
||||
extern crate alloc;
|
||||
#[allow(deprecated)]
|
||||
#[cfg(feature = "collections")]
|
||||
extern crate collections;
|
||||
#[cfg(any(test, feature = "log"))]
|
||||
#[macro_use(log, log_enabled, trace, debug)]
|
||||
extern crate log;
|
||||
|
|
|
@ -8,8 +8,8 @@ use alloc::rc::Rc;
|
|||
use std::vec::Vec;
|
||||
#[cfg(feature = "std")]
|
||||
use std::collections::VecDeque;
|
||||
#[cfg(feature = "collections")]
|
||||
use collections::{Vec, VecDeque};
|
||||
#[cfg(feature = "alloc")]
|
||||
use alloc::{Vec, VecDeque};
|
||||
|
||||
use {Error, Result};
|
||||
use super::{Device, DeviceLimits};
|
||||
|
|
|
@ -112,7 +112,7 @@ mod sys;
|
|||
mod tracer;
|
||||
mod fault_injector;
|
||||
mod pcap_writer;
|
||||
#[cfg(any(feature = "std", feature = "collections"))]
|
||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
||||
mod loopback;
|
||||
#[cfg(feature = "raw_socket")]
|
||||
mod raw_socket;
|
||||
|
@ -125,7 +125,7 @@ pub use self::sys::wait;
|
|||
pub use self::tracer::Tracer;
|
||||
pub use self::fault_injector::FaultInjector;
|
||||
pub use self::pcap_writer::{PcapLinkType, PcapMode, PcapSink, PcapWriter};
|
||||
#[cfg(any(feature = "std", feature = "collections"))]
|
||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
||||
pub use self::loopback::Loopback;
|
||||
#[cfg(any(feature = "raw_socket"))]
|
||||
pub use self::raw_socket::RawSocket;
|
||||
|
|
|
@ -61,7 +61,7 @@ impl<'a, 'b: 'a, 'c: 'a + 'b> Set<'a, 'b, 'c> {
|
|||
ManagedSlice::Borrowed(_) => {
|
||||
panic!("adding a socket to a full SocketSet")
|
||||
}
|
||||
#[cfg(any(feature = "std", feature = "collections"))]
|
||||
#[cfg(any(feature = "std", feature = "alloc"))]
|
||||
ManagedSlice::Owned(ref mut sockets) => {
|
||||
sockets.push(None);
|
||||
let index = sockets.len() - 1;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
//!
|
||||
//! The `storage` module provides containers for use in other modules.
|
||||
//! The containers support both pre-allocated memory, without the `std`
|
||||
//! and `collections` crates being available, and heap-allocated memory.
|
||||
//! or `alloc` crates being available, and heap-allocated memory.
|
||||
|
||||
mod assembler;
|
||||
mod ring_buffer;
|
||||
|
|
Loading…
Reference in New Issue