Merge pull request rust-lang#107 from JohnTitor/tracing-clippy-weird-relation

JohnTitor · web-flow · commit 3c50f15a9933 · 2022-11-21T21:31:15.000+09:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - run: rustup override set ${{env.MSRV}}
+      - run: rustup override set 1.62
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@v2.2.0
-      - run: cargo clippy --workspace -- --deny warnings --allow clippy::suspicious_else_formatting
+      - run: cargo clippy --workspace -- --deny warnings
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/conduit-router/Cargo.toml b/conduit-router/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 conduit = { version ="0.10.0", path = "../conduit" }
 route-recognizer = "0.3"
 thiserror = "1.0.37"
-tracing = "0.1.36"
+tracing = "0.1.37"
 
 [dev-dependencies]
 conduit-test = { version ="0.10.0", path = "../conduit-test" }
diff --git a/conduit-router/src/lib.rs b/conduit-router/src/lib.rs
@@ -1,5 +1,4 @@
 #![warn(rust_2018_idioms)]
-#![allow(clippy::suspicious_else_formatting)]
 
 #[macro_use]
 extern crate tracing;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#![warn(rust_2018_idioms)]`
`2`		`-#![allow(clippy::suspicious_else_formatting)]`
`3`	`2`
`4`	`3`	`#[macro_use]`
`5`	`4`	`extern crate tracing;`