Skip to content

Commit b24ef8a

Browse files
committed
---
yaml --- r: 108491 b: refs/heads/dist-snap c: 7e9bcc5 h: refs/heads/master i: 108489: 76a75a0 108487: 36465ad v: v3
1 parent 489f9e1 commit b24ef8a

File tree

6 files changed

+34
-8
lines changed

6 files changed

+34
-8
lines changed

[refs]

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

branches/dist-snap/src/doc/tutorial.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,32 @@ loop {
582582
This code prints out a weird sequence of numbers and stops as soon as
583583
it finds one that can be divided by five.
584584

585+
There is also a for-loop that can be used to iterate over a range of numbers:
586+
587+
~~~~
588+
for n in range(0, 5) {
589+
println!("{}", n);
590+
}
591+
~~~~
592+
593+
The snippet above prints integer numbers under 5 starting at 0.
594+
595+
More generally, a for loop works with anything implementing the `Iterator` trait.
596+
Data structures can provide one or more methods that return iterators over
597+
their contents. For example, strings support iteration over their contents in
598+
various ways:
599+
600+
~~~~
601+
let s = "Hello";
602+
for c in s.chars() {
603+
println!("{}", c);
604+
}
605+
~~~~
606+
607+
The snippet above prints the characters in "Hello" vertically, adding a new
608+
line after each character.
609+
610+
585611
# Data structures
586612

587613
## Structs

branches/dist-snap/src/librustc/middle/mem_categorization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ impl<TYPER:Typer> MemCategorizationContext<TYPER> {
11521152
format!("captured outer variable")
11531153
}
11541154
_ => {
1155-
format!("dereference of {} pointer", ptr_sigil(pk))
1155+
format!("dereference of `{}`-pointer", ptr_sigil(pk))
11561156
}
11571157
}
11581158
}

branches/dist-snap/src/test/compile-fail/borrowck-move-in-irrefut-pat.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
fn with(f: |&~str|) {}
1212

1313
fn arg_item(&_x: &~str) {}
14-
//~^ ERROR cannot move out of dereference of & pointer
14+
//~^ ERROR cannot move out of dereference of `&`-pointer
1515

1616
fn arg_closure() {
1717
with(|&_x| ())
18-
//~^ ERROR cannot move out of dereference of & pointer
18+
//~^ ERROR cannot move out of dereference of `&`-pointer
1919
}
2020

2121
fn let_pat() {
2222
let &_x = &~"hi";
23-
//~^ ERROR cannot move out of dereference of & pointer
23+
//~^ ERROR cannot move out of dereference of `&`-pointer
2424
}
2525

2626
pub fn main() {}

branches/dist-snap/src/test/compile-fail/borrowck-move-out-of-vec-tail.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub fn main() {
2626
[_, ..tail] => {
2727
match tail {
2828
[Foo { string: a }, Foo { string: b }] => {
29-
//~^ ERROR cannot move out of dereference of & pointer
30-
//~^^ ERROR cannot move out of dereference of & pointer
29+
//~^ ERROR cannot move out of dereference of `&`-pointer
30+
//~^^ ERROR cannot move out of dereference of `&`-pointer
3131
}
3232
_ => {
3333
unreachable!();

branches/dist-snap/src/test/compile-fail/issue-2590.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait parse {
1818

1919
impl parse for parser {
2020
fn parse(&self) -> ~[int] {
21-
self.tokens //~ ERROR cannot move out of dereference of & pointer
21+
self.tokens //~ ERROR cannot move out of dereference of `&`-pointer
2222
}
2323
}
2424

0 commit comments

Comments
 (0)