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: dtolnay/thiserror
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.41
Choose a base ref
...
head repository: dtolnay/thiserror
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.0.42
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 6, 2023

  1. Update to 2021 edition

    @dtolnay
    dtolnay committed Jul 6, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    43f3a2a View commit details

  2. Avoid calling a nonstandard write! macro that might be in scope

    @dtolnay
    dtolnay committed Jul 6, 2023
    Copy the full SHA
    264b7d1 View commit details

  3. Merge pull request #240 from dtolnay/stdwrite 

    Avoid calling a nonstandard write! macro that might be in scope
    @dtolnay
    dtolnay authored Jul 6, 2023
    Copy the full SHA
    6165f58 View commit details

  4. Release 1.0.42

    @dtolnay
    dtolnay committed Jul 6, 2023
    Copy the full SHA
    305be4a View commit details
Showing with 9 additions and 8 deletions.
  1. +3 −3 Cargo.toml
  2. +2 −2 impl/Cargo.toml
  3. +1 −2 impl/src/attr.rs
  4. +3 −1 src/lib.rs
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[package]
name = "thiserror"
version = "1.0.41"
version = "1.0.42"
authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["rust-patterns"]
description = "derive(Error)"
documentation = "https://docs.rs/thiserror"
edition = "2018"
edition = "2021"
keywords = ["error", "error-handling", "derive"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/thiserror"
rust-version = "1.56"

[dependencies]
thiserror-impl = { version = "=1.0.41", path = "impl" }
thiserror-impl = { version = "=1.0.42", path = "impl" }

[dev-dependencies]
anyhow = "1.0.71"
4 changes: 2 additions & 2 deletions impl/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "thiserror-impl"
version = "1.0.41"
version = "1.0.42"
authors = ["David Tolnay <dtolnay@gmail.com>"]
description = "Implementation detail of the `thiserror` crate"
edition = "2018"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/thiserror"
rust-version = "1.56"
3 changes: 1 addition & 2 deletions impl/src/attr.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use proc_macro2::{Delimiter, Group, Span, TokenStream, TokenTree};
use quote::{format_ident, quote, ToTokens};
use std::collections::BTreeSet as Set;
use std::iter::FromIterator;
use syn::parse::ParseStream;
use syn::{
braced, bracketed, parenthesized, token, Attribute, Error, Ident, Index, LitInt, LitStr, Meta,
@@ -198,7 +197,7 @@ impl ToTokens for Display<'_> {
let fmt = &self.fmt;
let args = &self.args;
tokens.extend(quote! {
write!(__formatter, #fmt #args)
thiserror::__private::write!(__formatter, #fmt #args)
});
}
}
4 changes: 3 additions & 1 deletion src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -228,7 +228,7 @@
//!
//! [`anyhow`]: https://github.com/dtolnay/anyhow
#![doc(html_root_url = "https://docs.rs/thiserror/1.0.41")]
#![doc(html_root_url = "https://docs.rs/thiserror/1.0.42")]
#![allow(
// Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7421
clippy::doc_markdown,
@@ -252,4 +252,6 @@ pub mod __private {
pub use crate::display::{DisplayAsDisplay, PathAsDisplay};
#[cfg(provide_any)]
pub use crate::provide::ThiserrorProvide;

pub use std::write;
}