Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 12 pull requests #42964

Merged
merged 30 commits into from
Jun 29, 2017
Merged
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b9a44fc
Update docs for fmt::write.
rthomas Jun 22, 2017
c5d078f
Update docs for std::fmt::format #29355.
rthomas Jun 22, 2017
60dd83e
add `allow_fail` test attribute
May 24, 2017
76d6052
Shorten some lines so this can pass the tidy checks
May 25, 2017
7ad9537
fix some tests i missed
May 25, 2017
45af6ee
Move global vars changing tests into run-pass
stepancheg Jun 24, 2017
8e5a302
Add a feature gate for the `#[allow_fail]` attribute
Jun 23, 2017
8edc3ca
Add compile-fail test for the new feature gate
Jun 23, 2017
4154f89
only show allowed failure count if there are allowed failures
Jun 25, 2017
d24d408
std: Fix implementation of `Alloc::alloc_one`
alexcrichton Jun 25, 2017
32b8579
make lint on-by-default/implied-by messages appear only once
zackmdavis Jun 26, 2017
330dab8
[libcore/cmp] Expand Ord/PartialOrd Derivable doc for enum types
behnam Jun 27, 2017
0dfd9c3
syntax: allow negative integer literal expression to be interpolated …
durka Jun 24, 2017
4fb67dc
Fix link reference
AndiDog Jun 28, 2017
40dec09
Document that `/` works as separator on Windows
matklad Jun 28, 2017
b689e46
Stamp the whole build script
aidanhs Jun 28, 2017
5ed3894
Move type parameter shadowing test to `ui`
estebank Jun 28, 2017
984e764
Record some details to help with possible bad clocks
aidanhs Jun 28, 2017
bea4e60
Rollup merge of #42219 - pwoolcoc:add-allow-fail-to-libtest, r=Guilla…
Jun 29, 2017
8b32c51
Rollup merge of #42831 - rthomas:master, r=QuietMisdreavus
Jun 29, 2017
5682494
Rollup merge of #42832 - rthomas:doc-fmt, r=steveklabnik
Jun 29, 2017
4bae0d8
Rollup merge of #42884 - stepancheg:set-env-run-pass, r=alexcrichton
Jun 29, 2017
effd1e0
Rollup merge of #42886 - durka:pplmm-mwe, r=petrochenkov
Jun 29, 2017
ea762f2
Rollup merge of #42901 - alexcrichton:alloc-one, r=sfackler
Jun 29, 2017
bfe0098
Rollup merge of #42919 - zackmdavis:once_again_we_heard_you_the_first…
Jun 29, 2017
647a36d
Rollup merge of #42920 - behnam:cmp, r=BurntSushi
Jun 29, 2017
486aca7
Rollup merge of #42946 - AndiDog:patch-1, r=GuillaumeGomez
Jun 29, 2017
4f12154
Rollup merge of #42953 - estebank:fix-20729, r=petrochenkov
Jun 29, 2017
b0ed6d1
Rollup merge of #42955 - matklad:doc-path, r=steveklabnik
Jun 29, 2017
d3329d7
Rollup merge of #42958 - aidanhs:aphs-better-stamping, r=Mark-Simulacrum
Jun 29, 2017
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
10 changes: 6 additions & 4 deletions src/libcore/cmp.rs
Original file line number Diff line number Diff line change
@@ -379,8 +379,9 @@ impl<T: Ord> Ord for Reverse<T> {
///
/// ## Derivable
///
/// This trait can be used with `#[derive]`. When `derive`d, it will produce a lexicographic
/// ordering based on the top-to-bottom declaration order of the struct's members.
/// This trait can be used with `#[derive]`. When `derive`d on structs, it will produce a
/// lexicographic ordering based on the top-to-bottom declaration order of the struct's members.
/// When `derive`d on enums, variants are ordered by their top-to-bottom declaration order.
///
/// ## How can I implement `Ord`?
///
@@ -512,8 +513,9 @@ impl PartialOrd for Ordering {
///
/// ## Derivable
///
/// This trait can be used with `#[derive]`. When `derive`d, it will produce a lexicographic
/// ordering based on the top-to-bottom declaration order of the struct's members.
/// This trait can be used with `#[derive]`. When `derive`d on structs, it will produce a
/// lexicographic ordering based on the top-to-bottom declaration order of the struct's members.
/// When `derive`d on enums, variants are ordered by their top-to-bottom declaration order.
///
/// ## How can I implement `PartialOrd`?
///