Merge pull request #324 from ron-rs/esc_ident

Backport (#323): Serialize struct idents with Serializer::write_identifier

Author: torkleyy

CHANGELOG.md

@@ -4,13 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.6] - 2020-10-21
+
+- Fix serialization of raw identifiers ([#323](https://github.com/ron-rs/ron/pull/323))
+- Add `unwrap_variant_newtypes` extension ([#319](https://github.com/ron-rs/ron/pull/319))
+
 ## [0.6.5] - 2021-09-09
 - support serde renames that start with a digit
 
 ## [0.6.3] - 2020-12-18
 - bump `base64` dependency to 0.13
 
 ## [0.6.2] - 2020-09-09
+
 - Added `decimal_floats` PrettyConfig option, which always includes decimals in floats (`1.0` vs `1`) ([#237](https://github.com/ron-rs/ron/pull/237))
 - Fixed EBNF grammar for raw strings ([#236](https://github.com/ron-rs/ron/pull/236), unsigned integers ([#248](https://github.com/ron-rs/ron/pull/248)), and nested comments ([#272](https://github.com/ron-rs/ron/pull/272))
 - Added `ser::to_writer_pretty` ([#269](https://github.com/ron-rs/ron/pull/269))

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ron"
 # Memo: update version in src/lib.rs too (doc link)
-version = "0.6.5"
+version = "0.6.6"
 license = "MIT/Apache-2.0"
 keywords = ["parser", "serde", "serialization"]
 authors = [

src/lib.rs

@@ -57,7 +57,7 @@ Serializing / Deserializing is as simple as calling `to_string` / `from_str`.
 
 !*/
 
-#![doc(html_root_url = "https://docs.rs/ron/0.6.5")]
+#![doc(html_root_url = "https://docs.rs/ron/0.6.6")]
 
 pub mod de;
 pub mod ser;

src/ser/mod.rs

@@ -928,7 +928,7 @@ impl<'a, W: io::Write> ser::SerializeStruct for Compound<'a, W> {
             }
         };
         ser.indent()?;
-        ser.output.write_all(key.as_bytes())?;
+        ser.write_identifier(key)?;
         ser.output.write_all(b":")?;
 
         if ser.is_pretty() {

tests/322_escape_idents.rs

@@ -0,0 +1,35 @@
+use serde::{Deserialize, Serialize};
+use std::collections::HashMap;
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "kebab-case")]
+enum MyEnumWithDashes {
+    ThisIsMyUnitVariant,
+    ThisIsMyTupleVariant(bool, i32),
+}
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+#[serde(rename_all = "kebab-case")]
+struct MyStructWithDashes {
+    my_enum: MyEnumWithDashes,
+    #[serde(rename = "2nd")]
+    my_enum2: MyEnumWithDashes,
+    will_be_renamed: u32,
+}
+
+#[test]
+fn roundtrip_ident_with_dash() {
+    let value = MyStructWithDashes {
+        my_enum: MyEnumWithDashes::ThisIsMyUnitVariant,
+        my_enum2: MyEnumWithDashes::ThisIsMyTupleVariant(false, -3),
+        will_be_renamed: 32,
+    };
+
+    let serial = ron::ser::to_string(&value).unwrap();
+
+    println!("Serialized: {}", serial);
+
+    let deserial = ron::de::from_str(&serial);
+
+    assert_eq!(Ok(value), deserial);
+}