about summary refs log tree commit diff
path: root/src/libterm
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-08 03:50:16 +0000
committerbors <bors@rust-lang.org>2018-12-08 03:50:16 +0000
commit059e6a6f57f4e80d527a3cd8a8afe7f51f01af8e (patch)
tree90e0d7a855be8202279b6bdde6cbdc95d834f07a /src/libterm
parent0a7798079608b4ff014471ae64b6c8201aa59cdf (diff)
parent003c5b796eae78c8c260bfddfc332a69926a6152 (diff)
downloadrust-059e6a6f57f4e80d527a3cd8a8afe7f51f01af8e.tar.gz
rust-059e6a6f57f4e80d527a3cd8a8afe7f51f01af8e.zip
Auto merge of #56578 - alexreg:cosmetic-1, r=alexreg
Various minor/cosmetic improvements to code

r? @Centril 😄
Diffstat (limited to 'src/libterm')
-rw-r--r--src/libterm/lib.rs2
-rw-r--r--src/libterm/terminfo/searcher.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 5ac46c2c5eb..b28e62f16fd 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -198,7 +198,7 @@ pub trait Terminal: Write {
     /// *Note: This does not flush.*
     ///
     /// That means the reset command may get buffered so, if you aren't planning on doing anything
-    /// else that might flush stdout's buffer (e.g. writing a line of text), you should flush after
+    /// else that might flush stdout's buffer (e.g., writing a line of text), you should flush after
     /// calling reset.
     fn reset(&mut self) -> io::Result<bool>;
 
diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs
index 492d26e625c..426dc4db87b 100644
--- a/src/libterm/terminfo/searcher.rs
+++ b/src/libterm/terminfo/searcher.rs
@@ -64,7 +64,7 @@ pub fn get_dbpath_for_term(term: &str) -> Option<PathBuf> {
             p.pop();
 
             // on some installations the dir is named after the hex of the char
-            // (e.g. macOS)
+            // (e.g., macOS)
             p.push(&format!("{:x}", first_char as usize));
             p.push(term);
             if fs::metadata(&p).is_ok() {
@@ -79,7 +79,7 @@ pub fn get_dbpath_for_term(term: &str) -> Option<PathBuf> {
 #[ignore(reason = "buildbots don't have ncurses installed and I can't mock everything I need")]
 fn test_get_dbpath_for_term() {
     // woefully inadequate test coverage
-    // note: current tests won't work with non-standard terminfo hierarchies (e.g. macOS's)
+    // note: current tests won't work with non-standard terminfo hierarchies (e.g., macOS's)
     use std::env;
     // FIXME (#9639): This needs to handle non-utf8 paths
     fn x(t: &str) -> String {