Merge pull request #2592 from dtolnay/remotenonexhaustive

Fix "cannot move out of *self which is behind a shared reference"
serde-rs · Aug 21, 2023 · 8b196ea · 8b196ea
2 parents d593215 + 1f8c8ad
commit 8b196ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/serde_derive/src/ser.rs b/serde_derive/src/ser.rs
@@ -409,9 +409,9 @@ fn serialize_enum(params: &Parameters, variants: &[Variant], cattrs: &attr::Cont
         })
         .collect();
 
-    if cattrs.non_exhaustive() {
+    if cattrs.remote().is_some() && cattrs.non_exhaustive() {
         arms.push(quote! {
-            unrecognized => _serde::__private::Err(_serde::ser::Error::custom(_serde::__private::ser::CannotSerializeVariant(unrecognized))),
+            ref unrecognized => _serde::__private::Err(_serde::ser::Error::custom(_serde::__private::ser::CannotSerializeVariant(unrecognized))),
         });
     }
 

diff --git a/test_suite/tests/test_remote.rs b/test_suite/tests/test_remote.rs
@@ -127,7 +127,7 @@ struct Test {
     enum_concrete: remote::EnumGeneric<u8>,
 
     #[serde(with = "ErrorKindDef")]
-    io_error_kind: std::io::ErrorKind,
+    io_error_kind: ErrorKind,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -200,8 +200,16 @@ enum EnumConcrete {
     Variant(u8),
 }
 
+#[derive(Debug)]
+enum ErrorKind {
+    NotFound,
+    PermissionDenied,
+    #[allow(dead_code)]
+    ConnectionRefused,
+}
+
 #[derive(Serialize, Deserialize)]
-#[serde(remote = "std::io::ErrorKind")]
+#[serde(remote = "ErrorKind")]
 #[non_exhaustive]
 enum ErrorKindDef {
     NotFound,