From 1b1e4caa79077d48c1bf56bf5bfa7bfc83fdf941 Mon Sep 17 00:00:00 2001
From: Huon Wilson <dbau.pp+github@gmail.com>
Date: Thu, 19 Dec 2013 23:03:11 +1100
Subject: std::vec: add a sugary .sort() method for plain Ord sorting.

This moves the custom sorting to `.sort_by`.
---
 src/libsyntax/attr.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/libsyntax/attr.rs')

diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 9b616781d4f..4564542f929 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -203,7 +203,11 @@ pub fn sort_meta_items(items: &[@MetaItem]) -> ~[@MetaItem] {
         .map(|&mi| (mi.name(), mi))
         .collect::<~[(@str, @MetaItem)]>();
 
+<<<<<<< HEAD
     v.sort(|&(a, _), &(b, _)| a <= b);
+=======
+    v.sort_by(|&(a, _): &(@str, @MetaItem), &(b, _): &(@str, @MetaItem)| a <= b);
+>>>>>>> 9ceda35... std::vec: add a sugary .sort() method for plain Ord sorting.
 
     // There doesn't seem to be a more optimal way to do this
     v.move_iter().map(|(_, m)| {
-- 
cgit 1.4.1-3-g733a5