diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-10-25 11:24:02 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-10-25 14:01:49 -0700 |
| commit | a9d7642b5da8730039b7abad7750ac47cb965198 (patch) | |
| tree | bf2bc6a0a8378a4e0d10a70f92aa507865f1e7ff /src/libsyntax/ext | |
| parent | 57cd6b3e3f0fc3d1805a167dfa2b4d5afc2f43a5 (diff) | |
| parent | d4432a797450594ff78457fe3e516bb0aeaedfe0 (diff) | |
Merge remote-tracking branch '14427/incoming'
Conflicts: src/libstd/sort.rs
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/qquote.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs index a83789642cc..af7ffaa73f5 100644 --- a/src/libsyntax/ext/qquote.rs +++ b/src/libsyntax/ext/qquote.rs @@ -127,7 +127,7 @@ fn gather_anti_quotes<N: qq_helper>(lo: uint, node: N) -> aq_ctxt pure fn by_lo(a: &gather_item, b: &gather_item) -> bool { a.lo < b.lo } - std::sort::merge_sort(by_lo, v) + std::sort::merge_sort(v, by_lo) }; return cx; } |