.github/workflows/ci.yml

@@ -5,32 +5,35 @@ on:
   pull_request:
   schedule: [cron: "40 1 * * *"]
 
+env:
+  RUSTFLAGS: -Dwarnings
+
 jobs:
   test:
     name: Rust ${{matrix.rust}}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        rust: [beta, stable, 1.36.0]
+        rust: [beta, stable, 1.38.0]
         include:
           - rust: nightly
             rustflags: --cfg thiserror_nightly_testing
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
           components: rust-src
       - run: cargo test --all
         env:
-          RUSTFLAGS: ${{matrix.rustflags}}
+          RUSTFLAGS: ${{matrix.rustflags}} ${{env.RUSTFLAGS}}
 
   msrv:
     name: Rust 1.31.0
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@1.31.0
       - run: cargo check
 
@@ -39,14 +42,25 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@clippy
       - run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
 
+  miri:
+    name: Miri
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@miri
+      - run: cargo miri test
+        env:
+          MIRIFLAGS: -Zmiri-tag-raw-pointers
+
   outdated:
     name: Outdated
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: dtolnay/install@cargo-outdated
       - run: cargo outdated --exit-code 1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thiserror"
-version = "1.0.30"
+version = "1.0.31"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 rust-version = "1.31"
@@ -12,7 +12,7 @@ categories = ["rust-patterns"]
 readme = "README.md"
 
 [dependencies]
-thiserror-impl = { version = "=1.0.30", path = "impl" }
+thiserror-impl = { version = "=1.0.31", path = "impl" }
 
 [dev-dependencies]
 anyhow = "1.0"

impl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "thiserror-impl"
-version = "1.0.30"
+version = "1.0.31"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 rust-version = "1.31"

impl/src/lib.rs

@@ -1,13 +1,15 @@
 #![allow(
     clippy::blocks_in_if_conditions,
+    clippy::cast_lossless,
     clippy::cast_possible_truncation,
     clippy::manual_map,
     clippy::map_unwrap_or,
     clippy::needless_pass_by_value,
     clippy::option_if_let_else,
     clippy::range_plus_one,
     clippy::single_match_else,
-    clippy::too_many_lines
+    clippy::too_many_lines,
+    clippy::wrong_self_convention
 )]
 
 extern crate proc_macro;

impl/src/valid.rs

@@ -180,7 +180,11 @@ fn check_field_attrs(fields: &[Field]) -> Result<()> {
         }
     }
     if let Some(from_field) = from_field {
-        if fields.len() > 1 + has_backtrace as usize {
+        let max_expected_fields = match backtrace_field {
+            Some(backtrace_field) => 1 + !same_member(from_field, backtrace_field) as usize,
+            None => 1 + has_backtrace as usize,
+        };
+        if fields.len() > max_expected_fields {
             return Err(Error::new_spanned(
                 from_field.attrs.from,
                 "deriving From requires no fields other than source and backtrace",

src/lib.rs

@@ -205,6 +205,7 @@
     // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7421
     clippy::doc_markdown,
     clippy::module_name_repetitions,
+    clippy::return_self_not_must_use,
 )]
 
 mod aserror;

tests/compiletest.rs

@@ -1,6 +1,5 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 #[rustversion::attr(not(nightly), ignore)]
+#[cfg_attr(miri, ignore)]
 #[test]
 fn ui() {
     let t = trybuild::TestCases::new();

tests/test_display.rs

@@ -1,5 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 use std::fmt::Display;
 use thiserror::Error;
 

tests/test_error.rs

@@ -1,4 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
 #![allow(dead_code)]
 
 use std::fmt::{self, Display};

tests/test_expr.rs

@@ -1,5 +1,4 @@
-#![deny(clippy::all, clippy::pedantic)]
-#![allow(clippy::option_if_let_else)]
+#![allow(clippy::iter_cloned_collect, clippy::option_if_let_else)]
 
 use std::fmt::Display;
 use thiserror::Error;

tests/test_from.rs

@@ -1,5 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 use std::io;
 use thiserror::Error;
 

tests/test_generics.rs

@@ -1,4 +1,4 @@
-#![deny(clippy::all, clippy::pedantic)]
+#![allow(clippy::needless_late_init)]
 
 use std::fmt::{self, Debug, Display};
 use thiserror::Error;

tests/test_option.rs

@@ -1,5 +1,4 @@
 #![cfg_attr(thiserror_nightly_testing, feature(backtrace))]
-#![deny(clippy::all, clippy::pedantic)]
 
 #[cfg(thiserror_nightly_testing)]
 pub mod structs {

tests/test_path.rs

@@ -1,5 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 use ref_cast::RefCast;
 use std::fmt::Display;
 use std::path::{Path, PathBuf};

tests/test_source.rs

@@ -1,5 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 use std::error::Error as StdError;
 use std::io;
 use thiserror::Error;

tests/test_transparent.rs

@@ -1,5 +1,3 @@
-#![deny(clippy::all, clippy::pedantic)]
-
 use anyhow::anyhow;
 use std::error::Error as _;
 use std::io;

tests/ui/concat-display.stderr

@@ -5,6 +5,6 @@ error: expected string literal
    |                 ^^^^^^
 ...
 13 | error_type!(Error, "foo");
-   | -------------------------- in this macro invocation
+   | ------------------------- in this macro invocation
    |
    = note: this error originates in the macro `error_type` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/ui/from-backtrace-backtrace.rs

@@ -0,0 +1,12 @@
+// https://github.com/dtolnay/thiserror/issues/163
+
+#![feature(backtrace)]
+
+use std::backtrace::Backtrace;
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+#[error("...")]
+pub struct Error(#[from] #[backtrace] std::io::Error, Backtrace);
+
+fn main() {}

tests/ui/from-backtrace-backtrace.stderr

@@ -0,0 +1,5 @@
+error: deriving From requires no fields other than source and backtrace
+  --> tests/ui/from-backtrace-backtrace.rs:10:18
+   |
+10 | pub struct Error(#[from] #[backtrace] std::io::Error, Backtrace);
+   |                  ^^^^^^^