commit c96cdc2db2ac145cafaf830f97c08e2915be9a67
author Georg Semmler <github@weiznich.de> Mon Mar 13 10:03:48 2023 +0100
committer GitHub <noreply@github.com> Mon Mar 13 10:03:48 2023 +0100
tree 7cab0b1ddb04dbbfe6823c3a1f7861b8004a6644
parent eedc141db5538925fc611e9c5b778d2c1b0ff436
parent 6c70a2eec12469a8c22647de6d88adea66f9fc5f

Merge pull request #3543 from weiznich/fix/quote_breaking_change

Fix #3541

CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 870da02..c42597a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,12 @@
 
 ## Unreleased 
 
+## [diesel_derives 2.0.2] 2023-03-13 
+
+## Fixed 
+
+* Fixing the fallout of a breaking change from `quote` by not using their internal API
+
 ## [2.0.3] 2023-01-24
 
 ## Fixed
@@ -1982,3 +1988,4 @@
 [2.0.0]: https://github.com/diesel-rs/diesel/compare/v.1.4.0...v2.0.0
 [2.0.1]: https://github.com/diesel-rs/diesel/compare/v.2.0.0...v2.0.1
 [2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.1...v2.0.2
+[diesel_derives 2.0.2]: https://github.com/diesel-rs/diesel/compare/v.2.0.2...diesel_derives_v2.0.2

diesel_derives/Cargo.toml

diff --git a/diesel_derives/Cargo.toml b/diesel_derives/Cargo.toml
index 258f21d..2c43f63 100644
--- a/diesel_derives/Cargo.toml
+++ b/diesel_derives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "diesel_derives"
-version = "2.0.1"
+version = "2.0.2"
 license = "MIT OR Apache-2.0"
 description = "You should not use this crate directly, it is internal to Diesel."
 documentation = "https://diesel.rs/guides/"

diesel_derives/src/attrs.rs

diff --git a/diesel_derives/src/attrs.rs b/diesel_derives/src/attrs.rs
index 9da55c7..7536821 100644
--- a/diesel_derives/src/attrs.rs
+++ b/diesel_derives/src/attrs.rs
@@ -2,11 +2,11 @@
 
 use proc_macro2::{Span, TokenStream};
 use proc_macro_error::ResultExt;
-use quote::spanned::Spanned;
 use quote::ToTokens;
 use syn::parse::discouraged::Speculative;
 use syn::parse::{Parse, ParseStream, Parser, Result};
 use syn::punctuated::Punctuated;
+use syn::spanned::Spanned;
 use syn::token::Comma;
 use syn::{parenthesized, Attribute, Ident, LitBool, LitStr, Path, Type, TypePath};
 
@@ -141,7 +141,7 @@
 }
 
 impl Spanned for FieldAttr {
-    fn __span(&self) -> Span {
+    fn span(&self) -> Span {
         match self {
             FieldAttr::Embed(ident)
             | FieldAttr::ColumnName(ident, _)
@@ -240,7 +240,7 @@
 }
 
 impl Spanned for StructAttr {
-    fn __span(&self) -> Span {
+    fn span(&self) -> Span {
         match self {
             StructAttr::Aggregate(ident)
             | StructAttr::NotSized(ident)
@@ -262,8 +262,6 @@
 where
     T: Parse + ParseDeprecated + Spanned,
 {
-    use syn::spanned::Spanned;
-
     attrs
         .iter()
         .flat_map(|attr| {

diesel_tests/tests/select.rs

diff --git a/diesel_tests/tests/select.rs b/diesel_tests/tests/select.rs
index ad0e368..309e86d 100644
--- a/diesel_tests/tests/select.rs
+++ b/diesel_tests/tests/select.rs
@@ -1,4 +1,5 @@
 use super::schema::*;
+#[cfg(not(feature = "mysql"))]
 use crate::schema_dsl::*;
 use diesel::*;
 
@@ -214,7 +215,8 @@
     }
 }
 
-#[cfg(not(feature = "sqlite"))]
+// the test is somehow broken on some mariadb versions
+#[cfg(not(any(feature = "sqlite", feature = "mysql")))]
 #[test]
 fn select_for_update_locks_selected_rows() {
     use self::users_select_for_update::dsl::*;