about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-12-29 09:33:04 +0000
committerbors <bors@rust-lang.org>2019-12-29 09:33:04 +0000
commite0239b4bd00cdc74a95caa7440bec6f9a2e7e300 (patch)
tree7497501431fa5073b69dbe7b1b571def35ddfd02 /src/libstd
parent774a4bd4f4f6c91dda7c46550769349a522856f7 (diff)
parent71b6ae92a16524857c42155b75f46245fb84171f (diff)
downloadrust-e0239b4bd00cdc74a95caa7440bec6f9a2e7e300.tar.gz
rust-e0239b4bd00cdc74a95caa7440bec6f9a2e7e300.zip
Auto merge of #67694 - Dylan-DPC:rollup-wxxm9yu, r=Dylan-DPC
Rollup of 3 pull requests

Successful merges:

 - #67482 (Fix outdated comment)
 - #67673 (Update .mailmap)
 - #67679 (Change "be returning" to "return")

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/env.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs
index 60facd9f8d4..13fe3bda525 100644
--- a/src/libstd/env.rs
+++ b/src/libstd/env.rs
@@ -6,7 +6,7 @@
 //!
 //! There are several functions and structs in this module that have a
 //! counterpart ending in `os`. Those ending in `os` will return an [`OsString`]
-//! and those without will be returning a [`String`].
+//! and those without will return a [`String`].
 //!
 //! [`OsString`]: ../../std/ffi/struct.OsString.html
 //! [`String`]: ../string/struct.String.html