Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a7bd6c4
Link to "Contributing to Rust" rather than "Getting Started".
follower Sep 27, 2020
81edbbc
Implement TryFrom between NonZero types.
m-ou-se Sep 29, 2020
0c32e81
Fixing escaping to ensure generation of welformed json.
gilescope Oct 13, 2020
a93f58f
Join map operators
wcampbell0x2a Oct 13, 2020
964a5ac
Use is_ok() instead of empty Ok(_)
wcampbell0x2a Oct 13, 2020
abfbd1b
Avoid extraneous space between visibility kw and ident for statics
ayazhafiz Oct 13, 2020
e60072f
fixup! Avoid extraneous space between visibility kw and ident for sta…
ayazhafiz Oct 13, 2020
000ec5e
Made slice sort documentation consistent between stable and unstable …
ryan-scott-dev Oct 14, 2020
8446d94
Following #74010 by converting some newer cases of backticked O notat…
ryan-scott-dev Oct 14, 2020
b9db54b
Bump nzint_try_from_nzint_conv stabilization version to 1.49.
m-ou-se Oct 15, 2020
5948e62
Sync LLVM submodule if it has been initialized
est31 Oct 20, 2020
e852a4a
Update cargo
ehuss Oct 20, 2020
e0b6111
Mark `repr128` as `incomplete_features`
varkor Oct 3, 2020
d725da1
Clean up and improve some docs
camelid Oct 19, 2020
769b410
Make closures inherit the parent function's target features
LeSeulArtichaut Oct 22, 2020
683db31
Fix clippy tests
varkor Oct 22, 2020
b4a9854
Fixup: add missing trailing newline
LeSeulArtichaut Oct 22, 2020
36a5244
Explain where the closure return type was inferred
Aaron1011 Oct 22, 2020
954b5a8
Rename parse_const_expr to parse_const_block
spastorino Oct 20, 2020
f8842b9
Make inline const work in range patterns
spastorino Oct 19, 2020
83abed9
Make inline const work for half open ranges
spastorino Oct 19, 2020
5bef429
Add ..= const { .. } missing tests and sort them properly
spastorino Oct 20, 2020
5656a41
Bless tests
spastorino Oct 20, 2020
13bc087
Clean up lib docs
camelid Oct 19, 2020
f82adf5
Add test of incompatible match arm types with multiline arm
dtolnay Oct 22, 2020
b005950
Reduce diagram mess in 'match arms have incompatible types' error
dtolnay Oct 22, 2020
5b32c84
Add a regression test for issue-72616
JohnTitor Oct 23, 2020
043fab3
Make it regression test of issue-77668
JohnTitor Oct 23, 2020
98e1316
Add regression test for issue-71732
JohnTitor Oct 23, 2020
b40ca64
Rollup merge of #77268 - follower:patch-3, r=jyn514
JohnTitor Oct 23, 2020
8e37330
Rollup merge of #77339 - fusion-engineering-forks:tryfrom-nonzero-to-…
JohnTitor Oct 23, 2020
da3e41e
Rollup merge of #77488 - varkor:repr128-incomplete_features, r=jonas-…
JohnTitor Oct 23, 2020
4859786
Rollup merge of #77890 - gilescope:welformed-json-output-from-libtest…
JohnTitor Oct 23, 2020
b968738
Rollup merge of #77918 - wcampbell0x2a:cleanup-network-tests, r=m-ou-se
JohnTitor Oct 23, 2020
4704259
Rollup merge of #77920 - ayazhafiz:i/mut-ident-spacing, r=jyn514
JohnTitor Oct 23, 2020
39f8289
Rollup merge of #77969 - ryan-scott-dev:bigo-notation-consistency, r=…
JohnTitor Oct 23, 2020
709de78
Rollup merge of #78098 - camelid:fixup-docs, r=steveklabnik
JohnTitor Oct 23, 2020
982c4b3
Rollup merge of #78116 - spastorino:inline-const-in-range-pat, r=petr…
JohnTitor Oct 23, 2020
025481a
Rollup merge of #78153 - est31:downloaded_llvm_maybe_sync, r=Mark-Sim…
JohnTitor Oct 23, 2020
dfb0d09
Rollup merge of #78163 - camelid:fixup-lib-docs, r=m-ou-se
JohnTitor Oct 23, 2020
29461c1
Rollup merge of #78169 - ehuss:update-cargo, r=ehuss
JohnTitor Oct 23, 2020
00c4dcd
Rollup merge of #78231 - LeSeulArtichaut:closure-target_feature, r=ni…
JohnTitor Oct 23, 2020
3f462c2
Rollup merge of #78235 - Aaron1011:closure-ret-infer, r=varkor
JohnTitor Oct 23, 2020
7ba519e
Rollup merge of #78255 - dtolnay:match, r=lcnr
JohnTitor Oct 23, 2020
6884632
Rollup merge of #78263 - JohnTitor:mir-opt-ice-test, r=lcnr
JohnTitor Oct 23, 2020
b5d2ff0
Rollup merge of #78265 - JohnTitor:type-iference-diag-test, r=lcnr
JohnTitor Oct 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library/alloc/src/raw_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ impl<T, A: AllocRef> RawVec<T, A> {
/// Ensures that the buffer contains at least enough space to hold `len +
/// additional` elements. If it doesn't already have enough capacity, will
/// reallocate enough space plus comfortable slack space to get amortized
/// `O(1)` behavior. Will limit this behavior if it would needlessly cause
/// *O*(1) behavior. Will limit this behavior if it would needlessly cause
/// itself to panic.
///
/// If `len` exceeds `self.capacity()`, this may fail to actually allocate
Expand Down
14 changes: 7 additions & 7 deletions library/alloc/src/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ mod hack {
impl<T> [T] {
/// Sorts the slice.
///
/// This sort is stable (i.e., does not reorder equal elements) and `O(n * log(n))` worst-case.
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*n* \* log(*n*)) worst-case.
///
/// When applicable, unstable sorting is preferred because it is generally faster than stable
/// sorting and it doesn't allocate auxiliary memory.
Expand Down Expand Up @@ -202,7 +202,7 @@ impl<T> [T] {

/// Sorts the slice with a comparator function.
///
/// This sort is stable (i.e., does not reorder equal elements) and `O(n * log(n))` worst-case.
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*n* \* log(*n*)) worst-case.
///
/// The comparator function must define a total ordering for the elements in the slice. If
/// the ordering is not total, the order of the elements is unspecified. An order is a
Expand Down Expand Up @@ -256,8 +256,8 @@ impl<T> [T] {

/// Sorts the slice with a key extraction function.
///
/// This sort is stable (i.e., does not reorder equal elements) and `O(m * n * log(n))`
/// worst-case, where the key function is `O(m)`.
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*m* \* *n* \* log(*n*))
/// worst-case, where the key function is *O*(*m*).
///
/// For expensive key functions (e.g. functions that are not simple property accesses or
/// basic operations), [`sort_by_cached_key`](#method.sort_by_cached_key) is likely to be
Expand Down Expand Up @@ -299,8 +299,8 @@ impl<T> [T] {
///
/// During sorting, the key function is called only once per element.
///
/// This sort is stable (i.e., does not reorder equal elements) and `O(m * n + n * log(n))`
/// worst-case, where the key function is `O(m)`.
/// This sort is stable (i.e., does not reorder equal elements) and *O*(*m* \* *n* + *n* \* log(*n*))
/// worst-case, where the key function is *O*(*m*).
///
/// For simple key functions (e.g., functions that are property accesses or
/// basic operations), [`sort_by_key`](#method.sort_by_key) is likely to be
Expand Down Expand Up @@ -944,7 +944,7 @@ where
/// 1. for every `i` in `1..runs.len()`: `runs[i - 1].len > runs[i].len`
/// 2. for every `i` in `2..runs.len()`: `runs[i - 2].len > runs[i - 1].len + runs[i].len`
///
/// The invariants ensure that the total running time is `O(n * log(n))` worst-case.
/// The invariants ensure that the total running time is *O*(*n* \* log(*n*)) worst-case.
fn merge_sort<T, F>(v: &mut [T], mut is_less: F)
where
F: FnMut(&T, &T) -> bool,
Expand Down
2 changes: 1 addition & 1 deletion library/alloc/src/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ use crate::raw_vec::RawVec;
/// `Vec` does not guarantee any particular growth strategy when reallocating
/// when full, nor when [`reserve`] is called. The current strategy is basic
/// and it may prove desirable to use a non-constant growth factor. Whatever
/// strategy is used will of course guarantee `O(1)` amortized [`push`].
/// strategy is used will of course guarantee *O*(1) amortized [`push`].
///
/// `vec![x; n]`, `vec![a, b, c, d]`, and
/// [`Vec::with_capacity(n)`][`Vec::with_capacity`], will all produce a `Vec`
Expand Down
6 changes: 3 additions & 3 deletions library/core/src/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1945,10 +1945,10 @@ impl<T> [T] {
///
/// The comparator function must define a total ordering for the elements in the slice. If
/// the ordering is not total, the order of the elements is unspecified. An order is a
/// total order if it is (for all a, b and c):
/// total order if it is (for all `a`, `b` and `c`):
///
/// * total and antisymmetric: exactly one of a < b, a == b or a > b is true; and
/// * transitive, a < b and b < c implies a < c. The same must hold for both == and >.
/// * total and antisymmetric: exactly one of `a < b`, `a == b` or `a > b` is true, and
/// * transitive, `a < b` and `b < c` implies `a < c`. The same must hold for both `==` and `>`.
///
/// For example, while [`f64`] doesn't implement [`Ord`] because `NaN != NaN`, we can use
/// `partial_cmp` as our sort function when we know the slice doesn't contain a `NaN`.
Expand Down
12 changes: 6 additions & 6 deletions library/core/src/str/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fn str_index_overflow_fail() -> ! {
/// self`. Equivalent to `&self[0 .. len]` or `&mut self[0 .. len]`. Unlike
/// other indexing operations, this can never panic.
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// Prior to 1.20.0, these indexing operations were still supported by
/// direct implementation of `Index` and `IndexMut`.
Expand Down Expand Up @@ -130,7 +130,7 @@ unsafe impl SliceIndex<str> for ops::RangeFull {
/// Returns a slice of the given string from the byte range
/// [`begin`, `end`).
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// Prior to 1.20.0, these indexing operations were still supported by
/// direct implementation of `Index` and `IndexMut`.
Expand Down Expand Up @@ -237,7 +237,7 @@ unsafe impl SliceIndex<str> for ops::Range<usize> {
/// Returns a slice of the given string from the byte range [`0`, `end`).
/// Equivalent to `&self[0 .. end]` or `&mut self[0 .. end]`.
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// Prior to 1.20.0, these indexing operations were still supported by
/// direct implementation of `Index` and `IndexMut`.
Expand Down Expand Up @@ -308,7 +308,7 @@ unsafe impl SliceIndex<str> for ops::RangeTo<usize> {
/// `len`). Equivalent to `&self[begin .. len]` or `&mut self[begin ..
/// len]`.
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// Prior to 1.20.0, these indexing operations were still supported by
/// direct implementation of `Index` and `IndexMut`.
Expand Down Expand Up @@ -385,7 +385,7 @@ unsafe impl SliceIndex<str> for ops::RangeFrom<usize> {
/// self[begin .. end + 1]`, except if `end` has the maximum value for
/// `usize`.
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// # Panics
///
Expand Down Expand Up @@ -441,7 +441,7 @@ unsafe impl SliceIndex<str> for ops::RangeInclusive<usize> {
/// Equivalent to `&self [0 .. end + 1]`, except if `end` has the maximum
/// value for `usize`.
///
/// This operation is `O(1)`.
/// This operation is *O*(1).
///
/// # Panics
///
Expand Down