diff --git a/doc/Makefile b/doc/Makefile index c1e3f5c1e379e..4d3a7d038dd79 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -2,7 +2,7 @@ DOC_VER := $(shell date +"%Y-%m-%d")-snap all: rust.pdf rust.html -version.texi: Makefile +version.texi: Makefile rust.texi git log -1 \ --format='@macro gitversion%n%h %ci%n@end macro%n' >$@ diff --git a/doc/rust.texi b/doc/rust.texi index fed7d9ec6fefd..1576f4f8f5f28 100644 --- a/doc/rust.texi +++ b/doc/rust.texi @@ -247,7 +247,7 @@ roles. @item Static control over memory allocation, packing and aliasing. Many values in Rust are allocated @emph{within} their containing stack-frame -or parent strucure. Numbers, records, tuples and tags are all allocated this +or parent structure. Numbers, records, tuples and tags are all allocated this way. To allocate such values in the heap, they must be explicitly @emph{boxed}. A @dfn{box} is a pointer to a heap allocation that holds another value, its @emph{content}. If the content of a box is a @emph{state} value -- @@ -1392,7 +1392,7 @@ automatically adjusting reference counts on the associated heap allocation. For these operations, to access the value held in the box requires an explicit dereference of the box value. Explicitly dereferencing a box is indicated with the unary @emph{star} operator @code{*}. Examples of such -@dfn{explicit dererence} operations are: +@dfn{explicit dereference} operations are: @itemize @item copying box values (@code{x = y}) @item passing box values to functions (@code{f(x,y)}) @@ -1845,7 +1845,7 @@ iter range(int lo, int hi) -> int @{ @} let int sum = 0; -for each (int x = range(0,100)) @{ +for each (int x in range(0,100)) @{ sum += x; @} @end example @@ -2325,7 +2325,7 @@ iter range(int x, int y) -> int @{ @} @} -for each (int i = range(5,7)) @{ +for each (int i in range(5,7)) @{ @dots{}; @} @end example @@ -3149,7 +3149,7 @@ fn read_file_lines(&str path) -> vec[str] @{ note path; vec[str] r; file f = open_read(path); - for each (str &s = lines(f)) @{ + for each (&str s in lines(f)) @{ vec.append(r,s); @} ret r; @@ -3282,7 +3282,7 @@ Example of a foreach loop: @example let str txt; let vec[str] lines; -for each (&str s = _str.split(txt, "\n")) @{ +for each (&str s in _str.split(txt, "\n")) @{ vec.push(lines, s); @} @end example