]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #37054 - rednum:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 2 Nov 2016 12:37:33 +0000 (05:37 -0700)
committerGitHub <noreply@github.com>
Wed, 2 Nov 2016 12:37:33 +0000 (05:37 -0700)
Add or and or_else for ordering.

Fixes https://github.com/rust-lang/rust/issues/37053 (see discussion in rust-lang/rfcs#1677).


Trivial merge