From 4a331897cbe259fce32cf35a7ea68bdd1229cb06 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Fri, 31 Jul 2015 17:05:22 -0400 Subject: [PATCH] Replace unstable VecMap w/ external crate. --- deps/Cargo.toml | 1 + src/tr/deps.mk | 2 +- src/tr/tr.rs | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deps/Cargo.toml b/deps/Cargo.toml index 2851d83a3..9607091c3 100644 --- a/deps/Cargo.toml +++ b/deps/Cargo.toml @@ -10,6 +10,7 @@ libc = "0.1.8" getopts = "0.2.11" bit-vec = "0.4.0" bit-set = "0.2.0" +vec_map = "0.3.0" num_cpus = "*" rand = "0.3.8" regex = "0.1.38" diff --git a/src/tr/deps.mk b/src/tr/deps.mk index 556049c9b..5e9f37b70 100644 --- a/src/tr/deps.mk +++ b/src/tr/deps.mk @@ -1 +1 @@ -DEPLIBS += bit-vec bit-set +DEPLIBS += bit-vec bit-set vec_map diff --git a/src/tr/tr.rs b/src/tr/tr.rs index 557ae1058..a95fc9460 100644 --- a/src/tr/tr.rs +++ b/src/tr/tr.rs @@ -1,5 +1,5 @@ #![crate_name = "tr"] -#![feature(io, vecmap)] +#![feature(io)] /* * This file is part of the uutils coreutils package. @@ -14,11 +14,12 @@ extern crate bit_set; extern crate getopts; +extern crate vec_map; use bit_set::BitSet; use getopts::Options; -use std::collections::VecMap; use std::io::{stdin, stdout, BufReader, Read, Write}; +use vec_map::VecMap; use expand::ExpandSet;