From 7d406b152ada9c2af9af66724462710da014ff1a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sat, 30 May 2020 18:46:26 +0200
Subject: [PATCH 1/2] test WTF8 encoding corner cases

---
 tests/run-pass/wtf8.rs | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tests/run-pass/wtf8.rs

diff --git a/tests/run-pass/wtf8.rs b/tests/run-pass/wtf8.rs
new file mode 100644
index 0000000000..2b4da785f2
--- /dev/null
+++ b/tests/run-pass/wtf8.rs
@@ -0,0 +1,23 @@
+// ignore-linux: tests Windows-only APIs
+// ignore-macos: tests Windows-only APIs
+
+use std::os::windows::ffi::{OsStrExt, OsStringExt};
+use std::ffi::{OsStr, OsString};
+
+fn test1() {
+    let base = "a\té \u{7f}💩\r";
+    let mut base: Vec<u16> = OsStr::new(base).encode_wide().collect();
+    base.push(0xD800);
+    let _res = OsString::from_wide(&base);
+}
+
+fn test2() {
+    let mut base: Vec<u16> = OsStr::new("aé ").encode_wide().collect();
+    base.push(0xD83D);
+    let mut _res: Vec<u16> = OsString::from_wide(&base).encode_wide().collect();
+}
+
+fn main() {
+    test1();
+    test2();
+}

From 7cd68eb11b08571e75d882510dea7ce95f2d439f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 1 Jun 2020 01:15:00 +0200
Subject: [PATCH 2/2] rustup

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index dd0af02836..c5327e4d2b 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-b6fa392238a459c29a47e2cf824d79a49a8ba039
+5fd2f06e99a985dd896684cb2c9f8c7090eca1ab