diff options
| author | bors <bors@rust-lang.org> | 2022-09-04 18:10:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-04 18:10:04 +0000 |
| commit | 0ebd3ab63aa08337bb4e4600358679262ce8d242 (patch) | |
| tree | 0dfaee0b3b84f3594c86d2d25958f0b44c8accc6 /library/std/src | |
| parent | a2cdcb3fea2baae5d20eabaa412e0d2f5b98c318 (diff) | |
| parent | cea11f50dc9e6e28d74e0e08e24641147c7c7fb8 (diff) | |
Auto merge of #101411 - matthiaskrgr:rollup-uj24yb5, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #101322 (Fix internal doc link) - #101385 (updated description of File struct in std::fs) - #101388 (Don't delay invalid LHS bug unless it will be covered by an error in `check_overloaded_binop`) - #101394 (Forbid mixing `System` with direct sytem allocator calls) - #101397 (rustdoc: remove redundant mobile-sized `.source nav:not(.sidebar).sub`) - #101401 (Make `char::is_lowercase` and `char::is_uppercase` const) - #101407 (Remove duplicated test (superseeded by search-form-elements.goml)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/alloc.rs | 5 | ||||
| -rw-r--r-- | library/std/src/fs.rs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/library/std/src/alloc.rs b/library/std/src/alloc.rs index a05e0db3af7..61c1ff578b2 100644 --- a/library/std/src/alloc.rs +++ b/library/std/src/alloc.rs @@ -68,7 +68,10 @@ pub use alloc_crate::alloc::*; /// The default memory allocator provided by the operating system. /// /// This is based on `malloc` on Unix platforms and `HeapAlloc` on Windows, -/// plus related functions. +/// plus related functions. However, it is not valid to mix use of the backing +/// system allocator with `System`, as this implementation may include extra +/// work, such as to serve alignment requests greater than the alignment +/// provided directly by the backing system allocator. /// /// This type implements the `GlobalAlloc` trait and Rust programs by default /// work as if they had this definition: diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs index 28a2c99f7e5..c6c78dc3939 100644 --- a/library/std/src/fs.rs +++ b/library/std/src/fs.rs @@ -19,7 +19,7 @@ use crate::sys::fs as fs_imp; use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner}; use crate::time::SystemTime; -/// A reference to an open file on the filesystem. +/// An object providing access to an open file on the filesystem. /// /// An instance of a `File` can be read and/or written depending on what options /// it was opened with. Files also implement [`Seek`] to alter the logical cursor |
