Skip to content

Commit 3214b10

Browse files
borsbors
committed
---
yaml --- r: 105801 b: refs/heads/master c: 1c2ccf0 h: refs/heads/master i: 105799: 7e8b314 v: v3
1 parent d4371d1 commit 3214b10

File tree

20 files changed

+63
-62
lines changed

20 files changed

+63
-62
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: cbbc1fc843a0bea0191f66b76ff6fcc9005d7b0f
2+
refs/heads/master: 1c2ccf0503b7a74e94c8e57136a0878c6bcf30df
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b8601a3d8b91ad3b653d143307611f2f5c75617e
55
refs/heads/try: db814977d07bd798feb24f6b74c00800ef458a13

‎trunk/mk/dist.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \
171171
--resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg
172172
$(Q)rm -rf tmp rust.pkg
173173

174-
tmp/dist/pkgres-$(1)/LICENSE.txt: $(S)/LICENSE.txt
174+
tmp/dist/pkgres-$(1)/LICENSE.txt: LICENSE.txt
175175
@$$(call E,pkg resource LICENSE.txt)
176176
$(Q)mkdir -p $$(@D)
177177
$(Q)cp $$< $$@

‎trunk/mk/install.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ endif
1717
install: dist-install-dir-$(CFG_BUILD)
1818
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
1919
# Remove tmp files while we can because they may have been created under sudo
20-
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
20+
$(Q)rm -R tmp/dist
2121

2222
uninstall: dist-install-dir-$(CFG_BUILD)
2323
$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
2424
# Remove tmp files while we can because they may have been created under sudo
25-
$(Q)rm -R tmp/dist/$(PKG_NAME)-$(CFG_BUILD)
25+
$(Q)rm -R tmp/dist
2626

2727

2828
######################################################################

‎trunk/src/doc/guide-container.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ vectors is as follows:
278278
279279
~~~ {.ignore}
280280
impl<A> FromIterator<A> for ~[A] {
281-
pub fn from_iterator<T: Iterator<A>>(iterator: &mut T) -> ~[A] {
281+
pub fn from_iter<T: Iterator<A>>(iterator: &mut T) -> ~[A] {
282282
let (lower, _) = iterator.size_hint();
283283
let mut xs = with_capacity(lower);
284284
for x in iterator {

‎trunk/src/etc/install.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ putvar() {
4545
else
4646
printf "install: %-20s := %s %s\n" $1 "$T" "$2"
4747
fi
48-
printf "%-20s := %s\n" $1 "$T" >>config.tmp
4948
}
5049

5150
valopt() {

‎trunk/src/libcollections/dlist.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl<A> DoubleEndedIterator<A> for MoveItems<A> {
582582
}
583583

584584
impl<A> FromIterator<A> for DList<A> {
585-
fn from_iterator<T: Iterator<A>>(iterator: T) -> DList<A> {
585+
fn from_iter<T: Iterator<A>>(iterator: T) -> DList<A> {
586586
let mut ret = DList::new();
587587
ret.extend(iterator);
588588
ret

‎trunk/src/libcollections/hashmap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,7 +1356,7 @@ pub type Values<'a, K, V> =
13561356
iter::Map<'static, (&'a K, &'a V), &'a V, Entries<'a, K, V>>;
13571357

13581358
impl<K: TotalEq + Hash<S>, V, S, H: Hasher<S> + Default> FromIterator<(K, V)> for HashMap<K, V, H> {
1359-
fn from_iterator<T: Iterator<(K, V)>>(iter: T) -> HashMap<K, V, H> {
1359+
fn from_iter<T: Iterator<(K, V)>>(iter: T) -> HashMap<K, V, H> {
13601360
let (lower, _) = iter.size_hint();
13611361
let mut map = HashMap::with_capacity_and_hasher(lower, Default::default());
13621362
map.extend(iter);
@@ -1540,7 +1540,7 @@ impl<T: TotalEq + Hash<S> + fmt::Show, S, H: Hasher<S>> fmt::Show for HashSet<T,
15401540
}
15411541

15421542
impl<T: TotalEq + Hash<S>, S, H: Hasher<S> + Default> FromIterator<T> for HashSet<T, H> {
1543-
fn from_iterator<I: Iterator<T>>(iter: I) -> HashSet<T, H> {
1543+
fn from_iter<I: Iterator<T>>(iter: I) -> HashSet<T, H> {
15441544
let (lower, _) = iter.size_hint();
15451545
let mut set = HashSet::with_capacity_and_hasher(lower, Default::default());
15461546
set.extend(iter);

‎trunk/src/libcollections/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl<'a, T> Iterator<&'a T> for Items<'a, T> {
193193
}
194194

195195
impl<T: Ord> FromIterator<T> for PriorityQueue<T> {
196-
fn from_iterator<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
196+
fn from_iter<Iter: Iterator<T>>(iter: Iter) -> PriorityQueue<T> {
197197
let mut q = PriorityQueue::new();
198198
q.extend(iter);
199199
q

‎trunk/src/libcollections/ringbuf.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ impl<A: Eq> Eq for RingBuf<A> {
386386
}
387387

388388
impl<A> FromIterator<A> for RingBuf<A> {
389-
fn from_iterator<T: Iterator<A>>(iterator: T) -> RingBuf<A> {
389+
fn from_iter<T: Iterator<A>>(iterator: T) -> RingBuf<A> {
390390
let (lower, _) = iterator.size_hint();
391391
let mut deq = RingBuf::with_capacity(lower);
392392
deq.extend(iterator);
@@ -778,7 +778,7 @@ mod tests {
778778
}
779779

780780
#[test]
781-
fn test_from_iterator() {
781+
fn test_from_iter() {
782782
use std::iter;
783783
let v = ~[1,2,3,4,5,6,7];
784784
let deq: RingBuf<int> = v.iter().map(|&x| x).collect();

‎trunk/src/libcollections/treemap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
971971
}
972972

973973
impl<K: TotalOrd, V> FromIterator<(K, V)> for TreeMap<K, V> {
974-
fn from_iterator<T: Iterator<(K, V)>>(iter: T) -> TreeMap<K, V> {
974+
fn from_iter<T: Iterator<(K, V)>>(iter: T) -> TreeMap<K, V> {
975975
let mut map = TreeMap::new();
976976
map.extend(iter);
977977
map
@@ -988,7 +988,7 @@ impl<K: TotalOrd, V> Extendable<(K, V)> for TreeMap<K, V> {
988988
}
989989

990990
impl<T: TotalOrd> FromIterator<T> for TreeSet<T> {
991-
fn from_iterator<Iter: Iterator<T>>(iter: Iter) -> TreeSet<T> {
991+
fn from_iter<Iter: Iterator<T>>(iter: Iter) -> TreeSet<T> {
992992
let mut set = TreeSet::new();
993993
set.extend(iter);
994994
set

‎trunk/src/libcollections/trie.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl<T> TrieMap<T> {
261261
}
262262

263263
impl<T> FromIterator<(uint, T)> for TrieMap<T> {
264-
fn from_iterator<Iter: Iterator<(uint, T)>>(iter: Iter) -> TrieMap<T> {
264+
fn from_iter<Iter: Iterator<(uint, T)>>(iter: Iter) -> TrieMap<T> {
265265
let mut map = TrieMap::new();
266266
map.extend(iter);
267267
map
@@ -346,7 +346,7 @@ impl TrieSet {
346346
}
347347

348348
impl FromIterator<uint> for TrieSet {
349-
fn from_iterator<Iter: Iterator<uint>>(iter: Iter) -> TrieSet {
349+
fn from_iter<Iter: Iterator<uint>>(iter: Iter) -> TrieSet {
350350
let mut set = TrieSet::new();
351351
set.extend(iter);
352352
set

‎trunk/src/libstd/iter.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ use mem;
7676
/// Conversion from an `Iterator`
7777
pub trait FromIterator<A> {
7878
/// Build a container with elements from an external iterator.
79-
fn from_iterator<T: Iterator<A>>(iterator: T) -> Self;
79+
fn from_iter<T: Iterator<A>>(iterator: T) -> Self;
8080
}
8181

8282
/// A type growable from an `Iterator` implementation
@@ -460,7 +460,7 @@ pub trait Iterator<A> {
460460
/// ```
461461
#[inline]
462462
fn collect<B: FromIterator<A>>(&mut self) -> B {
463-
FromIterator::from_iterator(self.by_ref())
463+
FromIterator::from_iter(self.by_ref())
464464
}
465465

466466
/// Loops through `n` iterations, returning the `n`th element of the
@@ -2336,7 +2336,7 @@ mod tests {
23362336
#[test]
23372337
fn test_counter_from_iter() {
23382338
let it = count(0, 5).take(10);
2339-
let xs: ~[int] = FromIterator::from_iterator(it);
2339+
let xs: ~[int] = FromIterator::from_iter(it);
23402340
assert_eq!(xs, ~[0, 5, 10, 15, 20, 25, 30, 35, 40, 45]);
23412341
}
23422342

‎trunk/src/libstd/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ pub fn collect<T, Iter: Iterator<Option<T>>, V: FromIterator<T>>(iter: Iter) ->
593593
}
594594
});
595595

596-
let v: V = FromIterator::from_iterator(iter.by_ref());
596+
let v: V = FromIterator::from_iter(iter.by_ref());
597597

598598
if iter.state {
599599
None

‎trunk/src/libstd/result.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ pub fn collect<T, E, Iter: Iterator<Result<T, E>>, V: FromIterator<T>>(iter: Ite
230230
}
231231
});
232232

233-
let v: V = FromIterator::from_iterator(iter.by_ref());
233+
let v: V = FromIterator::from_iter(iter.by_ref());
234234

235235
match iter.state {
236236
Some(err) => Err(err),

‎trunk/src/libstd/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2891,7 +2891,7 @@ impl<T> Drop for MoveItems<T> {
28912891
pub type RevMoveItems<T> = Rev<MoveItems<T>>;
28922892

28932893
impl<A> FromIterator<A> for ~[A] {
2894-
fn from_iterator<T: Iterator<A>>(mut iterator: T) -> ~[A] {
2894+
fn from_iter<T: Iterator<A>>(mut iterator: T) -> ~[A] {
28952895
let (lower, _) = iterator.size_hint();
28962896
let mut xs = with_capacity(lower);
28972897
for x in iterator {

‎trunk/src/libstd/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3019,7 +3019,7 @@ impl Clone for ~str {
30193019

30203020
impl FromIterator<char> for ~str {
30213021
#[inline]
3022-
fn from_iterator<T: Iterator<char>>(iterator: T) -> ~str {
3022+
fn from_iter<T: Iterator<char>>(iterator: T) -> ~str {
30233023
let (lower, _) = iterator.size_hint();
30243024
let mut buf = with_capacity(lower);
30253025
buf.extend(iterator);

‎trunk/src/libstd/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ impl<T:Clone> Clone for Vec<T> {
321321
}
322322

323323
impl<T> FromIterator<T> for Vec<T> {
324-
fn from_iterator<I:Iterator<T>>(mut iterator: I) -> Vec<T> {
324+
fn from_iter<I:Iterator<T>>(mut iterator: I) -> Vec<T> {
325325
let (lower, _) = iterator.size_hint();
326326
let mut vector = Vec::with_capacity(lower);
327327
for element in iterator {

‎trunk/src/libsyntax/owned_slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ impl<T> Container for OwnedSlice<T> {
126126
}
127127

128128
impl<T> FromIterator<T> for OwnedSlice<T> {
129-
fn from_iterator<I: Iterator<T>>(mut iter: I) -> OwnedSlice<T> {
129+
fn from_iter<I: Iterator<T>>(mut iter: I) -> OwnedSlice<T> {
130130
OwnedSlice::from_vec(iter.collect())
131131
}
132132
}

‎trunk/src/libsyntax/util/small_vector.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<T> Container for SmallVector<T> {
2929
}
3030

3131
impl<T> FromIterator<T> for SmallVector<T> {
32-
fn from_iterator<I: Iterator<T>>(iter: I) -> SmallVector<T> {
32+
fn from_iter<I: Iterator<T>>(iter: I) -> SmallVector<T> {
3333
let mut v = Zero;
3434
v.extend(iter);
3535
v
@@ -167,7 +167,7 @@ mod test {
167167
}
168168

169169
#[test]
170-
fn test_from_iterator() {
170+
fn test_from_iter() {
171171
let v: SmallVector<int> = (vec!(1, 2, 3)).move_iter().collect();
172172
assert_eq!(3, v.len());
173173
assert_eq!(&1, v.get(0));

‎trunk/src/test/bench/shootout-k-nucleotide.rs

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-android see #10393 #13206
1112
// ignore-pretty
1213

14+
use std::ascii::OwnedStrAsciiExt;
1315
use std::str;
1416
use std::slice;
1517

@@ -39,16 +41,16 @@ impl Code {
3941
Code((self.hash() << 2) + (pack_symbol(c) as u64))
4042
}
4143

42-
fn rotate(&self, c: u8, frame: i32) -> Code {
43-
Code(self.push_char(c).hash() & ((1u64 << (2 * (frame as u64))) - 1))
44+
fn rotate(&self, c: u8, frame: uint) -> Code {
45+
Code(self.push_char(c).hash() & ((1u64 << (2 * frame)) - 1))
4446
}
4547

4648
fn pack(string: &str) -> Code {
4749
string.bytes().fold(Code(0u64), |a, b| a.push_char(b))
4850
}
4951

5052
// FIXME: Inefficient.
51-
fn unpack(&self, frame: i32) -> ~str {
53+
fn unpack(&self, frame: uint) -> ~str {
5254
let mut key = self.hash();
5355
let mut result = Vec::new();
5456
for _ in range(0, frame) {
@@ -86,12 +88,12 @@ impl TableCallback for PrintCallback {
8688

8789
struct Entry {
8890
code: Code,
89-
count: i32,
91+
count: uint,
9092
next: Option<~Entry>,
9193
}
9294

9395
struct Table {
94-
count: i32,
96+
count: uint,
9597
items: Vec<Option<~Entry>> }
9698

9799
struct Items<'a> {
@@ -190,10 +192,10 @@ impl<'a> Iterator<&'a Entry> for Items<'a> {
190192

191193
fn pack_symbol(c: u8) -> u8 {
192194
match c as char {
193-
'a' | 'A' => 0,
194-
'c' | 'C' => 1,
195-
'g' | 'G' => 2,
196-
't' | 'T' => 3,
195+
'A' => 0,
196+
'C' => 1,
197+
'G' => 2,
198+
'T' => 3,
197199
_ => fail!("{}", c as char),
198200
}
199201
}
@@ -202,67 +204,67 @@ fn unpack_symbol(c: u8) -> u8 {
202204
TABLE[c]
203205
}
204206

205-
fn next_char<'a>(mut buf: &'a [u8]) -> &'a [u8] {
206-
loop {
207-
buf = buf.slice(1, buf.len());
208-
if buf.len() == 0 {
209-
break;
210-
}
211-
if buf[0] != (' ' as u8) && buf[0] != ('\t' as u8) &&
212-
buf[0] != ('\n' as u8) && buf[0] != 0 {
213-
break;
214-
}
215-
}
216-
buf
217-
}
218-
219207
fn generate_frequencies(frequencies: &mut Table,
220208
mut input: &[u8],
221-
frame: i32) {
209+
frame: uint) {
210+
if input.len() < frame { return; }
222211
let mut code = Code(0);
223212

224213
// Pull first frame.
225214
for _ in range(0, frame) {
226215
code = code.push_char(input[0]);
227-
input = next_char(input);
216+
input = input.slice_from(1);
228217
}
229218
frequencies.lookup(code, BumpCallback);
230219

231220
while input.len() != 0 && input[0] != ('>' as u8) {
232221
code = code.rotate(input[0], frame);
233222
frequencies.lookup(code, BumpCallback);
234-
input = next_char(input);
223+
input = input.slice_from(1);
235224
}
236225
}
237226

238-
fn print_frequencies(frequencies: &Table, frame: i32) {
227+
fn print_frequencies(frequencies: &Table, frame: uint) {
239228
let mut vector = Vec::new();
240229
for entry in frequencies.iter() {
241-
vector.push((entry.code, entry.count));
230+
vector.push((entry.count, entry.code));
242231
}
243232
vector.as_mut_slice().sort();
244233

245234
let mut total_count = 0;
246-
for &(_, count) in vector.iter() {
235+
for &(count, _) in vector.iter() {
247236
total_count += count;
248237
}
249238

250-
for &(key, count) in vector.iter() {
239+
for &(count, key) in vector.iter().rev() {
251240
println!("{} {:.3f}",
252241
key.unpack(frame),
253242
(count as f32 * 100.0) / (total_count as f32));
254243
}
244+
println!("");
255245
}
256246

257247
fn print_occurrences(frequencies: &mut Table, occurrence: &'static str) {
258248
frequencies.lookup(Code::pack(occurrence), PrintCallback(occurrence))
259249
}
260250

251+
fn get_sequence<R: Buffer>(r: &mut R, key: &str) -> ~[u8] {
252+
let mut res = ~"";
253+
for l in r.lines().map(|l| l.ok().unwrap())
254+
.skip_while(|l| key != l.slice_to(key.len())).skip(1)
255+
{
256+
res.push_str(l.trim());
257+
}
258+
res.into_ascii_upper().into_bytes()
259+
}
260+
261261
fn main() {
262-
let input = include_str!("shootout-k-nucleotide.data");
263-
let pos = input.find_str(">THREE").unwrap();
264-
let pos2 = pos + input.slice_from(pos).find_str("\n").unwrap();
265-
let input = input.slice_from(pos2 + 1).as_bytes();
262+
let input = if std::os::getenv("RUST_BENCH").is_some() {
263+
let fd = std::io::File::open(&Path::new("shootout-k-nucleotide.data"));
264+
get_sequence(&mut std::io::BufferedReader::new(fd), ">THREE")
265+
} else {
266+
get_sequence(&mut std::io::stdin(), ">THREE")
267+
};
266268

267269
let mut frequencies = Table::new();
268270
generate_frequencies(&mut frequencies, input, 1);
@@ -276,7 +278,7 @@ fn main() {
276278
frequencies = Table::new();
277279
generate_frequencies(&mut frequencies,
278280
input,
279-
occurrence.len() as i32);
281+
occurrence.len());
280282
print_occurrences(&mut frequencies, *occurrence);
281283
}
282284
}

0 commit comments

Comments
 (0)