about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-14 06:52:19 +0000
committerbors <bors@rust-lang.org>2018-12-14 06:52:19 +0000
commit664ede88faf57b8fc09715fc66cd9e46490ce64d (patch)
treea3e57a948123750226a0fed966826221420039c2 /src/libstd/sys
parent97a0bd60820374165427962e9802f4f3c3f7ff7b (diff)
parentcf47a19305d929d1870414dd6911ca3191597668 (diff)
downloadrust-664ede88faf57b8fc09715fc66cd9e46490ce64d.tar.gz
rust-664ede88faf57b8fc09715fc66cd9e46490ce64d.zip
Auto merge of #56536 - alexcrichton:update-master, r=Mark-Simulacrum
Bump to 1.33.0

* Update bootstrap compiler
* Update version to 1.33.0
* Remove some `#[cfg(stage0)]` annotations
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/windows/os.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs
index 2be30e68d24..84ef62e5fe9 100644
--- a/src/libstd/sys/windows/os.rs
+++ b/src/libstd/sys/windows/os.rs
@@ -76,7 +76,7 @@ pub fn error_string(mut errnum: i32) -> String {
         match String::from_utf16(&buf[..res]) {
             Ok(mut msg) => {
                 // Trim trailing CRLF inserted by FormatMessageW
-                let len = msg.trim_right().len();
+                let len = msg.trim_end().len();
                 msg.truncate(len);
                 msg
             },