Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 108 insertions, 0 deletions

diff --git a/third_party/rust/ron/tests/367_implicit_some.rs b/third_party/rust/ron/tests/367_implicit_some.rs
new file mode 100644
index 0000000000..4eeac4df35
--- /dev/null
+++ b/third_party/rust/ron/tests/367_implicit_some.rs
@@ -0,0 +1,108 @@
+#[derive(Debug, PartialEq, serde::Deserialize, serde::Serialize)]
+struct MaybeFields {
+    f1: i64,
+    f2: Option<i64>,
+    f3: Option<Option<i64>>,
+}
+
+#[test]
+fn test_recursive_implicit_some() {
+    // Test case provided by d86leader in
+    //  https://github.com/ron-rs/ron/issues/367#issue-1147920589
+
+    let x1: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1)");
+    let x2: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1, f2: None, f3: None)");
+    let x3: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1, f2: 2, f3: 3)");
+    let x4: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1, f2: 2, f3: Some(3))");
+    let x5: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1, f2: 2, f3: Some(Some(3)))");
+    let x6: std::result::Result<MaybeFields, _> =
+        ron::from_str("#![enable(implicit_some)]\n(f1: 1, f2: 2, f3: Some(None))");
+
+    assert_eq!(
+        x1,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: None,
+            f3: None
+        })
+    );
+    assert_eq!(
+        x2,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: None,
+            f3: None
+        })
+    );
+    assert_eq!(
+        x3,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: Some(2),
+            f3: Some(Some(3))
+        })
+    );
+    assert_eq!(
+        x4,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: Some(2),
+            f3: Some(Some(3))
+        })
+    );
+    assert_eq!(
+        x5,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: Some(2),
+            f3: Some(Some(3))
+        })
+    );
+    assert_eq!(
+        x6,
+        Ok(MaybeFields {
+            f1: 1,
+            f2: Some(2),
+            f3: Some(None)
+        })
+    );
+}
+
+#[test]
+fn test_nested_implicit_some() {
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\n5"),
+        Ok(Some(Some(Some(5))))
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\nNone"),
+        Ok(None)
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\nSome(5)"),
+        Ok(Some(Some(Some(5))))
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\nSome(None)"),
+        Ok(Some(None))
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\nSome(Some(5))"),
+        Ok(Some(Some(Some(5))))
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>("#![enable(implicit_some)]\nSome(Some(None))"),
+        Ok(Some(Some(None)))
+    );
+    assert_eq!(
+        ron::from_str::<Option<Option<Option<u32>>>>(
+            "#![enable(implicit_some)]\nSome(Some(Some(5)))"
+        ),
+        Ok(Some(Some(Some(5))))
+    );
+}