util: remove path deps (#3413)

* util: remove path deps * ci: run clippy with --all-features * ci: run tests with --all-features on FreeBSD CI
tokio-rs · Jan 12, 2021 · d37486d · d37486d
1 parent ed667c6
commit d37486d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -21,9 +21,9 @@ task:
       rustc --version
   test_script:
     - . $HOME/.cargo/env
-    - cargo test --all
+    - cargo test --all --all-features
     - cargo doc --all --no-deps
   i686_test_script:
     - . $HOME/.cargo/env
     - |
-      cargo test --all --target i686-unknown-freebsd
+      cargo test --all --all-features --target i686-unknown-freebsd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -232,7 +232,7 @@ jobs:
 
       # Run clippy
       - name: "clippy --all"
-        run: cargo clippy --all --tests
+        run: cargo clippy --all --tests --all-features
 
   docs:
     name: docs

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 # If you copy one of the examples into a new project, you should be using
 # [dependencies] instead.
 [dev-dependencies]
-tokio = { version = "1.0.0", path = "../tokio", features = ["full", "tracing"] }
-tokio-util = { version = "0.6.0", path = "../tokio-util", features = ["full"] }
-tokio-stream = { version = "0.1", path = "../tokio-stream" }
+tokio = { version = "1.0.0", features = ["full", "tracing"] }
+tokio-util = { version = "0.6.1", features = ["full"] }
+tokio-stream = { version = "0.1" }
 
 async-stream = "0.3"
 tracing = "0.1"

diff --git a/tokio-stream/src/wrappers/lines.rs b/tokio-stream/src/wrappers/lines.rs
@@ -30,6 +30,7 @@ impl<R> LinesStream<R> {
     }
 
     /// Obtain a pinned reference to the inner `Lines<R>`.
+    #[allow(clippy::wrong_self_convention)] // https://github.com/rust-lang/rust-clippy/issues/4546
     pub fn as_pin_mut(self: Pin<&mut Self>) -> Pin<&mut Lines<R>> {
         self.project().inner
     }

diff --git a/tokio-stream/src/wrappers/split.rs b/tokio-stream/src/wrappers/split.rs
@@ -30,6 +30,7 @@ impl<R> SplitStream<R> {
     }
 
     /// Obtain a pinned reference to the inner `Split<R>`.
+    #[allow(clippy::wrong_self_convention)] // https://github.com/rust-lang/rust-clippy/issues/4546
     pub fn as_pin_mut(self: Pin<&mut Self>) -> Pin<&mut Split<R>> {
         self.project().inner
     }

diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml
@@ -36,8 +36,8 @@ rt = ["tokio/rt"]
 __docs_rs = ["futures-util"]
 
 [dependencies]
-tokio = { version = "1.0.0", path = "../tokio" }
-tokio-stream = { version = "0.1", path = "../tokio-stream" }
+tokio = { version = "1.0.0" }
+tokio-stream = { version = "0.1" }
 
 bytes = "1.0.0"
 futures-core = "0.3.0"
@@ -49,8 +49,8 @@ pin-project-lite = "0.2.0"
 slab = { version = "0.4.1", optional = true } # Backs `DelayQueue`
 
 [dev-dependencies]
-tokio = { version = "1.0.0", path = "../tokio", features = ["full"] }
-tokio-test = { version = "0.4.0", path = "../tokio-test" }
+tokio = { version = "1.0.0", features = ["full"] }
+tokio-test = { version = "0.4.0" }
 
 futures = "0.3.0"
 futures-test = "0.3.5"