Skip to content

Commit 113ebd0

Browse files
committed
---
yaml --- r: 77023 b: refs/heads/snap-stage3 c: 5ed9f60 h: refs/heads/master i: 77021: 9dca534 77019: a8ad3e5 77015: 2991faa 77007: 19632ba 76991: 5384771 v: v3
1 parent d30f428 commit 113ebd0

File tree

310 files changed

+5690
-10692
lines changed

Some content is hidden

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

310 files changed

+5690
-10692
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: f1132496dddbdd88f321a7919eec3d65136b3f75
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: e66478193b1ad0582cdabb5ca769a85b26ea000c
4+
refs/heads/snap-stage3: 5ed9f60a9730e8e4b27db2baf3fea7af987ebfe3
55
refs/heads/try: ebfe63cd1c0b5d23f7ea60c69b4fde2e30cfd42a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,7 @@ do
739739
make_dir $h/test/doc-tutorial-ffi
740740
make_dir $h/test/doc-tutorial-macros
741741
make_dir $h/test/doc-tutorial-borrowed-ptr
742-
make_dir $h/test/doc-tutorial-container
743742
make_dir $h/test/doc-tutorial-tasks
744-
make_dir $h/test/doc-tutorial-conditions
745743
make_dir $h/test/doc-rust
746744
done
747745

branches/snap-stage3/doc/rust.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ a referencing source file, or by the name of the crate itself.
582582

583583
Each source file contains a sequence of zero or more `item` definitions,
584584
and may optionally begin with any number of `attributes` that apply to the containing module.
585-
Attributes on the anonymous crate module define important metadata that influences
585+
Atributes on the anonymous crate module define important metadata that influences
586586
the behavior of the compiler.
587587

588588
~~~~~~~~
@@ -788,7 +788,7 @@ extern mod complicated_mod = "some-file/in/the-rust/path";
788788
##### Use declarations
789789

790790
~~~~~~~~ {.ebnf .gram}
791-
use_decl : "pub" ? "use" ident [ '=' path
791+
use_decl : "pub"? "use" ident [ '=' path
792792
| "::" path_glob ] ;
793793
794794
path_glob : ident [ "::" path_glob ] ?
@@ -1273,7 +1273,7 @@ since the typechecker checks that any type with an implementation of `Circle` al
12731273

12741274
In type-parameterized functions,
12751275
methods of the supertrait may be called on values of subtrait-bound type parameters.
1276-
Referring to the previous example of `trait Circle : Shape`:
1276+
Refering to the previous example of `trait Circle : Shape`:
12771277

12781278
~~~
12791279
# trait Shape { fn area(&self) -> float; }
@@ -1914,13 +1914,13 @@ A field access on a record is an [lvalue](#lvalues-rvalues-and-temporaries) refe
19141914
When the field is mutable, it can be [assigned](#assignment-expressions) to.
19151915

19161916
When the type of the expression to the left of the dot is a pointer to a record or structure,
1917-
it is automatically dereferenced to make the field access possible.
1917+
it is automatically derferenced to make the field access possible.
19181918

19191919

19201920
### Vector expressions
19211921

19221922
~~~~~~~~{.ebnf .gram}
1923-
vec_expr : '[' "mut" ? vec_elems? ']'
1923+
vec_expr : '[' "mut"? vec_elems? ']'
19241924
19251925
vec_elems : [expr [',' expr]*] | [expr ',' ".." expr]
19261926
~~~~~~~~
@@ -2864,16 +2864,17 @@ the vtable pointer for the `T` implementation of `R`, and the pointer value of `
28642864
An example of an object type:
28652865

28662866
~~~~~~~~
2867+
# use std::int;
28672868
trait Printable {
2868-
fn to_string(&self) -> ~str;
2869+
fn to_str(&self) -> ~str;
28692870
}
28702871
28712872
impl Printable for int {
2872-
fn to_string(&self) -> ~str { self.to_str() }
2873+
fn to_str(&self) -> ~str { int::to_str(*self) }
28732874
}
28742875
28752876
fn print(a: @Printable) {
2876-
println(a.to_string());
2877+
println(a.to_str());
28772878
}
28782879
28792880
fn main() {

0 commit comments

Comments
 (0)