about summary refs log tree commit diff
path: root/library/std
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-18 18:04:47 +0000
committerbors <bors@rust-lang.org>2021-05-18 18:04:47 +0000
commit491cf5561efb1f5ff33c3234ccd0bc5cacbebe3e (patch)
treebd996aa4a98801b953ce49b432f8f462a050a17f /library/std
parenta5560a6a90f08a84728802bb5fa5632a17a78672 (diff)
parent738984311575475472d7ac10c6c02628ee4152e5 (diff)
downloadrust-491cf5561efb1f5ff33c3234ccd0bc5cacbebe3e.tar.gz
rust-491cf5561efb1f5ff33c3234ccd0bc5cacbebe3e.zip
Auto merge of #85443 - RalfJung:rollup-d9gd64t, r=RalfJung
Rollup of 7 pull requests

Successful merges:

 - #84462 (rustdoc: use focus for search navigation)
 - #85251 (Make `const_generics_defaults` not an incomplete feature)
 - #85404 (Backport 1.52.1 release notes)
 - #85407 (Improve display for "copy-path" button, making it more discreet)
 - #85423 (Don't require cmake on Windows when LLVM isn't being built)
 - #85428 (Add x.py pre-setup instructions)
 - #85442 (fix typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
-rw-r--r--library/std/src/io/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs
index 9f43379aff7..e18402f8dec 100644
--- a/library/std/src/io/mod.rs
+++ b/library/std/src/io/mod.rs
@@ -1663,7 +1663,7 @@ pub trait Seek {
     ///
     /// # Errors
     ///
-    /// Seeking can fail, for example becaue it might involve flushing a buffer.
+    /// Seeking can fail, for example because it might involve flushing a buffer.
     ///
     /// Seeking to a negative offset is considered an error.
     #[stable(feature = "rust1", since = "1.0.0")]
@@ -1675,7 +1675,7 @@ pub trait Seek {
     ///
     /// # Errors
     ///
-    /// Rewinding can fail, for example becaue it might involve flushing a buffer.
+    /// Rewinding can fail, for example because it might involve flushing a buffer.
     ///
     /// # Example
     ///