Skip to content

Commit d73c519

Browse files
committed
---
yaml --- r: 120719 b: refs/heads/dist-snap c: b53454e h: refs/heads/master i: 120717: 94c9d7a 120715: 43f2194 120711: 0c92520 120703: e3bc92e v: v3
1 parent be3804e commit d73c519

File tree

158 files changed

+1817
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+1817
-246
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 73dac7e4e61aa88cfc98433b61ba131b38af978d
9+
refs/heads/dist-snap: b53454e2e413ac58da20933968cb4a86a3c7c476
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/mk/crates.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,25 @@
5151

5252
TARGET_CRATES := libc std green rustuv native flate arena glob term semver \
5353
uuid serialize sync getopts collections num test time rand \
54-
workcache url log regex graphviz core rlibc alloc
54+
workcache url log regex graphviz core rlibc alloc debug
5555
HOST_CRATES := syntax rustc rustdoc fourcc hexfloat regex_macros fmt_macros
5656
CRATES := $(TARGET_CRATES) $(HOST_CRATES)
5757
TOOLS := compiletest rustdoc rustc
5858

5959
DEPS_core :=
6060
DEPS_rlibc :=
6161
DEPS_alloc := core libc native:jemalloc
62+
DEPS_debug := std
6263
DEPS_std := core libc alloc native:rustrt native:backtrace
6364
DEPS_graphviz := std
6465
DEPS_green := std rand native:context_switch
6566
DEPS_rustuv := std native:uv native:uv_support
6667
DEPS_native := std
67-
DEPS_syntax := std term serialize collections log fmt_macros
68+
DEPS_syntax := std term serialize collections log fmt_macros debug
6869
DEPS_rustc := syntax native:rustllvm flate arena serialize sync getopts \
69-
collections time log graphviz
70+
collections time log graphviz debug
7071
DEPS_rustdoc := rustc native:hoedown serialize sync getopts collections \
71-
test time
72+
test time debug
7273
DEPS_flate := std native:miniz
7374
DEPS_arena := std collections
7475
DEPS_graphviz := std
@@ -79,7 +80,7 @@ DEPS_semver := std
7980
DEPS_uuid := std serialize rand
8081
DEPS_sync := std alloc
8182
DEPS_getopts := std
82-
DEPS_collections := std rand
83+
DEPS_collections := std rand debug
8384
DEPS_fourcc := syntax std
8485
DEPS_hexfloat := syntax std
8586
DEPS_num := std rand

branches/dist-snap/src/doc/guide-container.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ for (x, y) in it {
254254
}
255255
256256
// yield and print the last pair from the iterator
257-
println!("last: {:?}", it.next());
257+
println!("last: {}", it.next());
258258
259259
// the iterator is now fully consumed
260260
assert!(it.next().is_none());
@@ -349,9 +349,9 @@ returning another `DoubleEndedIterator` with `next` and `next_back` exchanged.
349349
~~~
350350
let xs = [1, 2, 3, 4, 5, 6];
351351
let mut it = xs.iter();
352-
println!("{:?}", it.next()); // prints `Some(&1)`
353-
println!("{:?}", it.next()); // prints `Some(&2)`
354-
println!("{:?}", it.next_back()); // prints `Some(&6)`
352+
println!("{}", it.next()); // prints `Some(1)`
353+
println!("{}", it.next()); // prints `Some(2)`
354+
println!("{}", it.next_back()); // prints `Some(6)`
355355
356356
// prints `5`, `4` and `3`
357357
for &x in it.rev() {
@@ -367,7 +367,7 @@ let xs = [1, 2, 3, 4];
367367
let ys = [5, 6, 7, 8];
368368
let mut it = xs.iter().chain(ys.iter()).map(|&x| x * 2);
369369
370-
println!("{:?}", it.next()); // prints `Some(2)`
370+
println!("{}", it.next()); // prints `Some(2)`
371371
372372
// prints `16`, `14`, `12`, `10`, `8`, `6`, `4`
373373
for x in it.rev() {
@@ -398,17 +398,17 @@ underlying iterators are.
398398
let xs = [1, 2, 3, 4, 5];
399399
let ys = ~[7, 9, 11];
400400
let mut it = xs.iter().chain(ys.iter());
401-
println!("{:?}", it.idx(0)); // prints `Some(&1)`
402-
println!("{:?}", it.idx(5)); // prints `Some(&7)`
403-
println!("{:?}", it.idx(7)); // prints `Some(&11)`
404-
println!("{:?}", it.idx(8)); // prints `None`
401+
println!("{}", it.idx(0)); // prints `Some(1)`
402+
println!("{}", it.idx(5)); // prints `Some(7)`
403+
println!("{}", it.idx(7)); // prints `Some(11)`
404+
println!("{}", it.idx(8)); // prints `None`
405405
406406
// yield two elements from the beginning, and one from the end
407407
it.next();
408408
it.next();
409409
it.next_back();
410410
411-
println!("{:?}", it.idx(0)); // prints `Some(&3)`
412-
println!("{:?}", it.idx(4)); // prints `Some(&9)`
413-
println!("{:?}", it.idx(6)); // prints `None`
411+
println!("{}", it.idx(0)); // prints `Some(3)`
412+
println!("{}", it.idx(4)); // prints `Some(9)`
413+
println!("{}", it.idx(6)); // prints `None`
414414
~~~

0 commit comments

Comments
 (0)