itsscb/smoltcp
1
0
Fork 0
mirror of https://github.com/smoltcp-rs/smoltcp.git synced 2025-10-02 23:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all remnants of the collections feature.

Browse Source
This commit is contained in:
whitequark 2017-09-22 20:40:13 +00:00
parent 24b6165aee
commit bf4ddef87d
5 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib.rs
View File

@ -1,5 +1,4 @@
#![cfg_attr(feature = "alloc", feature(alloc))] #![cfg_attr(feature = "alloc", feature(alloc))]
#![cfg_attr(feature = "collections", feature(collections))]
#![no_std] #![no_std]
//! The _smoltcp_ library is built in a layered structure, with the layers corresponding //! The _smoltcp_ library is built in a layered structure, with the layers corresponding
@ -77,9 +76,6 @@ extern crate std;
extern crate libc; extern crate libc;
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
extern crate alloc; extern crate alloc;
#[allow(deprecated)]
#[cfg(feature = "collections")]
extern crate collections;
#[cfg(any(test, feature = "log"))] #[cfg(any(test, feature = "log"))]
#[macro_use(log, log_enabled, trace, debug)] #[macro_use(log, log_enabled, trace, debug)]
extern crate log; extern crate log;

4
src/phy/loopback.rs
View File

@ -8,8 +8,8 @@ use alloc::rc::Rc;
use std::vec::Vec; use std::vec::Vec;
#[cfg(feature = "std")] #[cfg(feature = "std")]
use std::collections::VecDeque; use std::collections::VecDeque;
#[cfg(feature = "collections")] #[cfg(feature = "alloc")]
use collections::{Vec, VecDeque}; use alloc::{Vec, VecDeque};
use {Error, Result}; use {Error, Result};
use super::{Device, DeviceLimits}; use super::{Device, DeviceLimits};

4
src/phy/mod.rs
View File

@ -112,7 +112,7 @@ mod sys;
mod tracer; mod tracer;
mod fault_injector; mod fault_injector;
mod pcap_writer; mod pcap_writer;
#[cfg(any(feature = "std", feature = "collections"))] #[cfg(any(feature = "std", feature = "alloc"))]
mod loopback; mod loopback;
#[cfg(feature = "raw_socket")] #[cfg(feature = "raw_socket")]
mod raw_socket; mod raw_socket;
@ -125,7 +125,7 @@ pub use self::sys::wait;
pub use self::tracer::Tracer; pub use self::tracer::Tracer;
pub use self::fault_injector::FaultInjector; pub use self::fault_injector::FaultInjector;
pub use self::pcap_writer::{PcapLinkType, PcapMode, PcapSink, PcapWriter}; 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; pub use self::loopback::Loopback;
#[cfg(any(feature = "raw_socket"))] #[cfg(any(feature = "raw_socket"))]
pub use self::raw_socket::RawSocket; pub use self::raw_socket::RawSocket;

2
src/socket/set.rs
View File

@ -61,7 +61,7 @@ impl<'a, 'b: 'a, 'c: 'a + 'b> Set<'a, 'b, 'c> {
ManagedSlice::Borrowed(_) => { ManagedSlice::Borrowed(_) => {
panic!("adding a socket to a full SocketSet") 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) => { ManagedSlice::Owned(ref mut sockets) => {
sockets.push(None); sockets.push(None);
let index = sockets.len() - 1; let index = sockets.len() - 1;

2
src/storage/mod.rs
View File

@ -2,7 +2,7 @@
//! //!
//! The `storage` module provides containers for use in other modules. //! The `storage` module provides containers for use in other modules.
//! The containers support both pre-allocated memory, without the `std` //! 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 assembler;
mod ring_buffer; mod ring_buffer;