Remove unnecessary smoltcp features

Author: thalesfragoso

.travis.yml

@@ -20,7 +20,7 @@ matrix:
     - rust: nightly
       env: FEATURES='stm32f429' ARGS="--release --target=thumbv7em-none-eabihf --example=pktgen"
     - rust: nightly
-      env: FEATURES='stm32f429 smoltcp-phy smoltcp-log smoltcp-verbose' ARGS="--release --target=thumbv7em-none-eabihf --example=ip"
+      env: FEATURES='stm32f429 smoltcp-phy log smoltcp/socket-tcp smoltcp/socket-icmp smoltcp/log smoltcp/verbose' ARGS="--release --target=thumbv7em-none-eabihf --example=ip"
     - rust: nightly
       env: FEATURES='stm32f745'
     - rust: nightly

Cargo.toml

@@ -23,10 +23,14 @@ aligned = "0.3"
 stm32f7xx-hal = {version = "0.2.0", optional = true}
 stm32f4xx-hal = {version = "0.8.3", optional = true}
 cortex-m = "0.6.2"
-
-smoltcp = { version = "0.6.0", default-features = false, features = ["proto-ipv4", "proto-ipv6", "socket-icmp", "socket-udp", "socket-tcp", "ethernet"], optional = true }
 log = { version = "0.4", optional = true }
 
+[dependencies.smoltcp]
+version = "0.6.0"
+default-features = false
+features = ["ethernet", "proto-ipv4"]
+optional = true
+
 [features]
 device-selected = []
 fence = []
@@ -51,8 +55,6 @@ stm32f778 = ["stm32f7xx-hal/stm32f778", "device-selected", "fence"]
 stm32f779 = ["stm32f7xx-hal/stm32f779", "device-selected", "fence"]
 
 smoltcp-phy = ["smoltcp"]
-smoltcp-log = ["log", "smoltcp/log"]
-smoltcp-verbose = ["smoltcp/verbose"]
 
 [dev-dependencies]
 cortex-m = "0.6.2"
@@ -67,7 +69,10 @@ required-features = ["stm32f429"]
 
 [[example]]
 name = "ip"
-required-features = ["stm32f429", "smoltcp-phy", "smoltcp-log", "smoltcp-verbose"]
+required-features = [
+    "stm32f429", "smoltcp-phy", "log", "smoltcp/socket-tcp", "smoltcp/socket-icmp",
+    "smoltcp/log", "smoltcp/verbose"
+]
 
 [profile.release]
 debug = 2

README.md

@@ -12,7 +12,7 @@ Please send pull requests.
 ## Building Examples
 ```
 cargo build --example="pktgen" --features="stm32f429"
-cargo build --example="ip" --features="stm32f429" --features="smoltcp-phy smoltcp-log smoltcp-verbose"
+cargo build --example="ip" --features="stm32f429 smoltcp-phy log smoltcp/socket-tcp smoltcp/socket-icmp smoltcp/log smoltcp/verbose"
 ```
 
 ## Usage

run.sh

@@ -13,7 +13,7 @@ if [[ "$EXAMPLE" = "" ]]; then
 fi
 
 cargo build --target=thumbv7em-none-eabihf --release \
-      --features="stm32f429 smoltcp-phy smoltcp-log smoltcp-verbose" \
+      --features="stm32f429 smoltcp-phy log smoltcp/socket-tcp smoltcp/socket-icmp smoltcp/log smoltcp/verbose" \
       --example=$EXAMPLE \
     || exit 1