diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-04-12 19:00:53 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-04-12 19:00:53 +1000 |
| commit | ea9bdaaed9e4cb91cb8dfc96d0ce2dab10eae1d2 (patch) | |
| tree | e69ca28029bb8b1449cfc5950e4401b530852cba /src/libsyntax/ext/deriving | |
| parent | bff374873136bacf8352e05f73cb3252761dc2d6 (diff) | |
| download | rust-ea9bdaaed9e4cb91cb8dfc96d0ce2dab10eae1d2.tar.gz rust-ea9bdaaed9e4cb91cb8dfc96d0ce2dab10eae1d2.zip | |
libsyntax: (maybe) fix deriving(TotalOrd) on windows
Diffstat (limited to 'src/libsyntax/ext/deriving')
| -rw-r--r-- | src/libsyntax/ext/deriving/cmp/totalord.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/ext/deriving/cmp/totalord.rs b/src/libsyntax/ext/deriving/cmp/totalord.rs index 9c20a0be87c..a098a7463d3 100644 --- a/src/libsyntax/ext/deriving/cmp/totalord.rs +++ b/src/libsyntax/ext/deriving/cmp/totalord.rs @@ -45,10 +45,10 @@ pub fn ordering_const(cx: @ext_ctxt, span: span, cnst: Ordering) -> @expr { Equal => ~"Equal", Greater => ~"Greater" }; - build::mk_path(cx, span, - ~[cx.ident_of(~"core"), - cx.ident_of(~"cmp"), - cx.ident_of(cnst)]) + build::mk_path_global(cx, span, + ~[cx.ident_of(~"core"), + cx.ident_of(~"cmp"), + cx.ident_of(cnst)]) } pub fn cs_cmp(cx: @ext_ctxt, span: span, @@ -61,7 +61,7 @@ pub fn cs_cmp(cx: @ext_ctxt, span: span, // foldr (possibly) nests the matches in lexical_ordering better false, |cx, span, old, new| { - build::mk_call(cx, span, lexical_ord, ~[old, new]) + build::mk_call_global(cx, span, lexical_ord, ~[old, new]) }, ordering_const(cx, span, Equal), |cx, span, list| { @@ -70,7 +70,7 @@ pub fn cs_cmp(cx: @ext_ctxt, span: span, // later one [(self_var, _, _), (other_var, _, _)] => ordering_const(cx, span, - self_var.cmp(&other_var)), + self_var.cmp(&other_var)), _ => cx.span_bug(span, "Not exactly 2 arguments in `deriving(TotalOrd)`") } }, |