Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: smoltcp-rs/smoltcp
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 15bd9896f12f
Choose a base ref
...
head repository: smoltcp-rs/smoltcp
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 19ed1f38d81a
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 22, 2017

  1. Update features to reflect merge of alloc and collections crates.

    @whitequark
    whitequark committed Sep 22, 2017
    Copy the full SHA
    4e8be41 View commit details

  2. Bump version.

    @whitequark
    whitequark committed Sep 22, 2017
    Copy the full SHA
    19ed1f3 View commit details
Showing with 5 additions and 11 deletions.
  1. +2 −3 Cargo.toml
  2. +3 −8 README.md
5 changes: 2 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "smoltcp"
version = "0.4.0-pre"
version = "0.4.0"
authors = ["whitequark <whitequark@whitequark.org>"]
description = "A TCP/IP stack designed for bare-metal, real-time systems without a heap."
documentation = "https://docs.rs/smoltcp/"
@@ -13,7 +13,7 @@ license = "0BSD"

[dependencies]
byteorder = { version = "1.0", default-features = false }
managed = { version = "0.3.0", default-features = false }
managed = { version = "0.4.0", default-features = false }
log = { version = "0.3", default-features = false, optional = true }
libc = { version = "0.2.18", optional = true }

@@ -25,7 +25,6 @@ getopts = "0.2"
[features]
std = ["managed/std"]
alloc = ["managed/alloc"]
collections = ["alloc", "managed/collections"]
verbose = []
raw_socket = ["libc"]
tap_interface = ["libc"]
11 changes: 3 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -77,15 +77,15 @@ To use the _smoltcp_ library in your project, add the following to `Cargo.toml`:

```toml
[dependencies]
smoltcp = "0.3"
smoltcp = "0.4"
```

The default configuration assumes a hosted environment, for ease of evaluation.
You probably want to disable default features and configure them one by one:

```toml
[dependencies]
smoltcp = { version = "0.3", default-features = false, features = ["..."] }
smoltcp = { version = "0.4", default-features = false, features = ["log"] }
```

### Feature `std`
@@ -104,12 +104,7 @@ These features are enabled by default.
### Feature `alloc`

The `alloc` feature enables use of objects owned by the networking stack through a dependency
on `alloc::boxed::Box`. This only works on nightly rustc.

### Feature `collections`

The `collections` feature enables use of slices owned by the networking stack through a dependency
on `collections::vec::Vec`. This only works on nightly rustc.
on collections from the `alloc` crate. This only works on nightly rustc.

### Feature `log`