squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

rollup merge of #19598: japaric/ord

Browse source 
cc #18755

r? @alexcrichton
cc @bjz
This commit is contained in:
Alex Crichton 2014-12-09 09:24:51 -08:00
commit 2a244ce7f4
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/libsyntax/ext/deriving/cmp/totalord.rs
View file

@ -66,12 +66,19 @@ pub fn cs_cmp(cx: &mut ExtCtxt, span: Span,
cx.ident_of("cmp"),
cx.ident_of("Equal")));
let cmp_path = vec![
cx.ident_of("std"),
cx.ident_of("cmp"),
cx.ident_of("Ord"),
cx.ident_of("cmp"),
];
/*
Builds:
let __test = self_field1.cmp(&other_field2);
let __test = ::std::cmp::Ord::cmp(&self_field1, &other_field1);
if other == ::std::cmp::Ordering::Equal {
let __test = self_field2.cmp(&other_field2);
let __test = ::std::cmp::Ord::cmp(&self_field2, &other_field2);
if __test == ::std::cmp::Ordering::Equal {
...
} else {
@ -83,11 +90,11 @@ pub fn cs_cmp(cx: &mut ExtCtxt, span: Span,
FIXME #6449: These `if`s could/should be `match`es.
*/
cs_same_method_fold(
cs_fold(
// foldr nests the if-elses correctly, leaving the first field
// as the outermost one, and the last as the innermost.
false,
|cx, span, old, new| {
|cx, span, old, self_f, other_fs| {
// let __test = new;
// if __test == ::std::cmp::Ordering::Equal {
// old
@ -95,6 +102,20 @@ pub fn cs_cmp(cx: &mut ExtCtxt, span: Span,
// __test
// }
let new = {
let other_f = match other_fs {
[ref o_f] => o_f,
_ => cx.span_bug(span, "not exactly 2 arguments in `deriving(PartialOrd)`"),
};
let args = vec![
cx.expr_addr_of(span, self_f),
cx.expr_addr_of(span, other_f.clone()),
];
cx.expr_call_global(span, cmp_path.clone(), args)
};
let assign = cx.stmt_let(span, false, test_id, new);
let cond = cx.expr_binary(span, ast::BiEq,

6
src/test/run-pass/issue-18738.rs
View file

@ -8,18 +8,18 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[deriving(PartialEq, PartialOrd)]
#[deriving(Eq, PartialEq, PartialOrd, Ord)]
enum Test<'a> {
Int(&'a int),
Slice(&'a [u8]),
}
#[deriving(PartialEq, PartialOrd)]
#[deriving(Eq, PartialEq, PartialOrd, Ord)]
struct Version {
vendor_info: &'static str
}
#[deriving(PartialEq, PartialOrd)]
#[deriving(Eq, PartialEq, PartialOrd, Ord)]
struct Foo(&'static str);
fn main() {}