diff options
| author | bors <bors@rust-lang.org> | 2020-04-17 21:57:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-17 21:57:06 +0000 |
| commit | cff9a758ae116a0b54a55033f6a5156f8656cc0c (patch) | |
| tree | d763343c30cab7190d2280146cc464515c13cca3 /src/libstd | |
| parent | ce93331e2cf21ac4b72a53854b105955919114e7 (diff) | |
| parent | 4b9eeca5c55f4064731a963674fa4056a9a50ce5 (diff) | |
| download | rust-cff9a758ae116a0b54a55033f6a5156f8656cc0c.tar.gz rust-cff9a758ae116a0b54a55033f6a5156f8656cc0c.zip | |
Auto merge of #71264 - Dylan-DPC:rollup-njgbey7, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #70467 (Use `call` instead of `invoke` for functions that cannot unwind ) - #71070 (rustbuild: Remove stage 0 LLD flavor workaround for MSVC) - #71167 (big-O notation: parenthesis for function calls, explicit multiplication) - #71238 (Miri: fix typo) - #71242 (Format Mailmap To Work With GitHub) - #71243 (Account for use of `try!()` in 2018 edition and guide users in the right direction) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/mod.rs | 8 | ||||
| -rw-r--r-- | src/libstd/ffi/mod.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/collections/mod.rs b/src/libstd/collections/mod.rs index e8b9e9cb1f2..cc6663bebd3 100644 --- a/src/libstd/collections/mod.rs +++ b/src/libstd/collections/mod.rs @@ -110,10 +110,10 @@ //! //! For Sets, all operations have the cost of the equivalent Map operation. //! -//! | | get | insert | remove | predecessor | append | -//! |--------------|-----------|----------|----------|-------------|--------| -//! | [`HashMap`] | O(1)~ | O(1)~* | O(1)~ | N/A | N/A | -//! | [`BTreeMap`] | O(log n) | O(log n) | O(log n) | O(log n) | O(n+m) | +//! | | get | insert | remove | predecessor | append | +//! |--------------|-----------|-----------|-----------|-------------|--------| +//! | [`HashMap`] | O(1)~ | O(1)~* | O(1)~ | N/A | N/A | +//! | [`BTreeMap`] | O(log(n)) | O(log(n)) | O(log(n)) | O(log(n)) | O(n+m) | //! //! # Correct and Efficient Usage of Collections //! diff --git a/src/libstd/ffi/mod.rs b/src/libstd/ffi/mod.rs index 72f7367c9dc..5aca7b7476a 100644 --- a/src/libstd/ffi/mod.rs +++ b/src/libstd/ffi/mod.rs @@ -43,8 +43,8 @@ //! terminator, so the buffer length is really `len+1` characters. //! Rust strings don't have a nul terminator; their length is always //! stored and does not need to be calculated. While in Rust -//! accessing a string's length is a O(1) operation (because the -//! length is stored); in C it is an O(length) operation because the +//! accessing a string's length is a `O(1)` operation (because the +//! length is stored); in C it is an `O(length)` operation because the //! length needs to be computed by scanning the string for the nul //! terminator. //! |