racerRust: 2015-05-04 -> 2015-05-18

Fixes build failure with rustc 1.0.0.
This commit is contained in:
Ricardo M. Correia 2015-05-19 02:37:47 +02:00
parent 82d46c2c2a
commit 85c48934bc
2 changed files with 4 additions and 32 deletions

View File

@ -4,16 +4,14 @@ with rustPlatform;
buildRustPackage rec {
#TODO add emacs support
name = "racer-git-2015-05-04";
name = "racer-git-2015-05-18";
src = fetchgit {
url = https://github.com/phildawes/racer;
rev = "bf2373ec08b0be03598283bd610c5b61bdb8738c";
sha256 = "0ldf05d19ghxk3fslxrc87j18zg8bam2y0ygdy456h37y2p1d1ck";
rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035";
sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7";
};
patches = [ ./pr-232.patch ];
depsSha256 = "0rinyh365znx39aygxyyxmi496pw0alblf2dl7l8fbmz63nkhfv2";
depsSha256 = "1wmpd2cjmk59382dq59hmb0xa6fxbnmmaz4nfs96qf613r5ylvra";
buildInputs = [ makeWrapper ];

View File

@ -1,26 +0,0 @@
From 3f354d69881424c7c902408d22f9138412a872b4 Mon Sep 17 00:00:00 2001
From: Ricardo Martins <ricardo@scarybox.net>
Date: Sat, 9 May 2015 17:12:55 +0100
Subject: [PATCH] Use `Vec::extend` instead of binary operation `+`.
---
src/racer/nameres.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/racer/nameres.rs b/src/racer/nameres.rs
index 60636c6..ad1e01c 100644
--- a/src/racer/nameres.rs
+++ b/src/racer/nameres.rs
@@ -620,9 +620,9 @@ pub fn search_scope(start: usize, point: usize, src: &str,
}
// There's a good chance of a match. Run the matchers
- out = out + &*run_matchers_on_blob(src, start+blobstart, start+blobend,
- searchstr,
- filepath, search_type, local, namespace);
+ out.extend(run_matchers_on_blob(src, start+blobstart, start+blobend,
+ searchstr,
+ filepath, search_type, local, namespace));
if let ExactMatch = search_type {
if !out.is_empty() {
return out.into_iter();