---

yaml
---
r: 130957
b: refs/heads/auto
c: faf14ae
h: refs/heads/master
i:
  130955: 29a2df4
v: v3

Author: steveklabnik

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1dc31953e7d1df1560ea43a13d19973a1374730d
+refs/heads/auto: faf14ae63308fc75ee59448f215a38db73dae645
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/README.md

@@ -101,18 +101,6 @@ There is a lot more documentation in the [wiki].
 
 [wiki]: https://github.com/rust-lang/rust/wiki
 
-## Getting help and getting involved
-
-The Rust community congregates in a few places:
-
-* [StackOverflow] - Get help here.
-* [/r/rust] - General discussion.
-* [discuss.rust-lang.org] - For development of the Rust language itself.
-
-[StackOverflow]: http://stackoverflow.com/questions/tagged/rust
-[/r/rust]: http://reddit.com/r/rust
-[discuss.rust-lang.org]: http://discuss.rust-lang.org/
-
 ## License
 
 Rust is primarily distributed under the terms of both the MIT license

branches/auto/mk/dist.mk

@@ -112,7 +112,7 @@ distcheck-tar-src: dist-tar-src
 
 ifdef CFG_ISCC
 
-PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe
+PKG_EXE = dist/$(PKG_NAME)-install.exe
 
 %.iss: $(S)src/etc/pkg/%.iss
 	cp $< $@
@@ -123,7 +123,7 @@ PKG_EXE = dist/$(PKG_NAME)-$(CFG_BUILD).exe
 $(PKG_EXE): rust.iss modpath.iss upgrade.iss LICENSE.txt rust-logo.ico \
             $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
             dist-prepare-win
-	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin $(CFG_BUILD)
+	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin
 	@$(call E, ISCC: $@)
 	$(Q)"$(CFG_ISCC)" $<
 

branches/auto/mk/docs.mk

@@ -76,22 +76,21 @@ endif
 
 # Check for the various external utilities for the EPUB/PDF docs:
 
-ifeq ($(CFG_LUALATEX),)
-  $(info cfg: no lualatex found, deferring to xelatex)
+ifeq ($(CFG_PDFLATEX),)
+  $(info cfg: no pdflatex found, deferring to xelatex)
   ifeq ($(CFG_XELATEX),)
-    $(info cfg: no xelatex found, deferring to pdflatex)
-    ifeq ($(CFG_PDFLATEX),)
-      $(info cfg: no pdflatex found, disabling LaTeX docs)
+    $(info cfg: no xelatex found, deferring to lualatex)
+    ifeq ($(CFG_LUALATEX),)
+      $(info cfg: no lualatex found, disabling LaTeX docs)
       NO_PDF_DOCS = 1
 	else
-      CFG_LATEX := $(CFG_PDFLATEX)
+      CFG_LATEX := $(CFG_LUALATEX)
     endif
   else
     CFG_LATEX := $(CFG_XELATEX)
-    XELATEX = 1
   endif
 else
-  CFG_LATEX := $(CFG_LUALATEX)
+  CFG_LATEX := $(CFG_PDFLATEX)
 endif
 
 
@@ -188,25 +187,12 @@ doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.tex | doc/
 ifneq ($(NO_PDF_DOCS),1)
 ifeq ($$(SHOULD_BUILD_PDF_DOC_$(1)),1)
 DOC_TARGETS += doc/$(1).pdf
-ifneq ($(XELATEX),1)
 doc/$(1).pdf: doc/$(1).tex
 	@$$(call E, latex compiler: $$@)
 	$$(Q)$$(CFG_LATEX) \
 	-interaction=batchmode \
 	-output-directory=doc \
 	$$<
-else
-# The version of xelatex on the snap bots seemingly ingores -output-directory
-# So we'll output to . and move to the doc directory manually.
-# This will leave some intermediate files in the build directory.
-doc/$(1).pdf: doc/$(1).tex
-	@$$(call E, latex compiler: $$@)
-	$$(Q)$$(CFG_LATEX) \
-	-interaction=batchmode \
-	-output-directory=. \
-	$$<
-	$$(Q)mv ./$(1).pdf $$@
-endif # XELATEX
 endif # SHOULD_BUILD_PDF_DOCS_$(1)
 endif # NO_PDF_DOCS
 

branches/auto/mk/reconfig.mk

@@ -15,11 +15,7 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) \
 
 ifndef CFG_DISABLE_MANAGE_SUBMODULES
 # This is a pretty expensive operation but I don't see any way to avoid it
-# NB: This only looks for '+' status (wrong commit checked out), not '-' status
-# (nothing checked out at all).  `./configure --{llvm,jemalloc,libuv}-root`
-# will explicitly deinitialize the corresponding submodules, and we don't
-# want to force constant rebuilds in that case.
-NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^+')
+NEED_GIT_RECONFIG=$(shell cd "$(CFG_SRC_DIR)" && "$(CFG_GIT)" submodule status | grep -c '^\(+\|-\)')
 else
 NEED_GIT_RECONFIG=0
 endif

branches/auto/src/doc/guide-strings.md

@@ -92,33 +92,9 @@ fn foo(s: String) {
 ```
 
 If you have good reason. It's not polite to hold on to ownership you don't
-need, and it can make your lifetimes more complex.
-
-## Generic functions
-
-To write a function that's generic over types of strings, use [the `Str`
-trait](http://doc.rust-lang.org/std/str/trait.Str.html):
-
-```{rust}
-fn some_string_length<T: Str>(x: T) -> uint {
-        x.as_slice().len()
-}
-
-fn main() {
-    let s = "Hello, world";
-
-    println!("{}", some_string_length(s));
-
-    let s = "Hello, world".to_string();
-
-    println!("{}", some_string_length(s));
-}
-```
-
-Both of these lines will print `12`. 
-
-The only method that the `Str` trait has is `as_slice()`, which gives you
-access to a `&str` value from the underlying string.
+need, and it can make your lifetimes more complex. Furthermore, you can pass
+either kind of string into `foo` by using `.as_slice()` on any `String` you
+need to pass in, so the `&str` version is more flexible.
 
 ## Comparisons
 
@@ -145,65 +121,6 @@ fn compare(string: String) {
 Converting a `String` to a `&str` is cheap, but converting the `&str` to a
 `String` involves an allocation.
 
-## Indexing strings
-
-You may be tempted to try to access a certain character of a `String`, like
-this:
-
-```{rust,ignore}
-let s = "hello".to_string();
-
-println!("{}", s[0]);
-```
-
-This does not compile. This is on purpose. In the world of UTF-8, direct
-indexing is basically never what you want to do. The reason is that each
-character can be a variable number of bytes. This means that you have to iterate
-through the characters anyway, which is a O(n) operation. 
-
-To iterate over a string, use the `graphemes()` method on `&str`:
-
-```{rust}
-let s = "αἰθήρ";
-
-for l in s.graphemes(true) {
-    println!("{}", l);
-}
-```
-
-Note that `l` has the type `&str` here, since a single grapheme can consist of
-multiple codepoints, so a `char` wouldn't be appropriate.
-
-This will print out each character in turn, as you'd expect: first "α", then
-"ἰ", etc. You can see that this is different than just the individual bytes.
-Here's a version that prints out each byte:
-
-```{rust}
-let s = "αἰθήρ";
-
-for l in s.bytes() {
-    println!("{}", l);
-}
-```
-
-This will print:
-
-```{notrust,ignore}
-206
-177
-225
-188
-176
-206
-184
-206
-174
-207
-129
-```
-
-Many more bytes than graphemes!
-
 # Other Documentation
 
 * [the `&str` API documentation](/std/str/index.html)

branches/auto/src/doc/guide.md

@@ -150,7 +150,7 @@ in your file name, use an underscore. `hello_world.rs` versus `goodbye.rs`.
 
 Now that you've got your file open, type this in:
 
-```{rust}
+```
 fn main() {
     println!("Hello, world!");
 }
@@ -166,7 +166,7 @@ Hello, world!
 
 Success! Let's go over what just happened in detail.
 
-```{rust}
+```
 fn main() {
 
 }
@@ -186,7 +186,7 @@ declaration, with one space in between.
 
 Next up is this line:
 
-```{rust}
+```
     println!("Hello, world!");
 ```
 
@@ -562,7 +562,7 @@ the block is executed. If it's `false`, then it is not.
 
 If you want something to happen in the `false` case, use an `else`:
 
-```{rust}
+```
 let x = 5i;
 
 if x == 5i {
@@ -574,8 +574,7 @@ if x == 5i {
 
 This is all pretty standard. However, you can also do this:
 
-
-```{rust}
+```
 let x = 5i;
 
 let y = if x == 5i {
@@ -587,7 +586,7 @@ let y = if x == 5i {
 
 Which we can (and probably should) write like this:
 
-```{rust}
+```
 let x = 5i;
 
 let y = if x == 5i { 10i } else { 15i };
@@ -644,7 +643,7 @@ every line of Rust code you see.
 What is this exception that makes us say 'almost?' You saw it already, in this
 code:
 
-```{rust}
+```
 let x = 5i;
 
 let y: int = if x == 5i { 10i } else { 15i };
@@ -990,7 +989,7 @@ notation: `origin.x`.
 The values in structs are immutable, like other bindings in Rust. However, you
 can use `mut` to make them mutable:
 
-```{rust}
+```rust
 struct Point {
     x: int,
     y: int,
@@ -1014,7 +1013,7 @@ called a **tuple struct**. Tuple structs do have a name, but their fields
 don't:
 
 
-```{rust}
+```
 struct Color(int, int, int);
 struct Point(int, int, int);
 ```
@@ -1029,7 +1028,7 @@ let origin = Point(0, 0, 0);
 It is almost always better to use a struct than a tuple struct. We would write
 `Color` and `Point` like this instead:
 
-```{rust}
+```rust
 struct Color {
     red: int,
     blue: int,
@@ -1050,7 +1049,7 @@ There _is_ one case when a tuple struct is very useful, though, and that's a
 tuple struct with only one element. We call this a 'newtype,' because it lets
 you create a new type that's a synonym for another one:
 
-```{rust}
+```
 struct Inches(int);
 
 let length = Inches(10);
@@ -1167,7 +1166,7 @@ what's the solution?
 Rust has a keyword, `match`, that allows you to replace complicated `if`/`else`
 groupings with something more powerful. Check it out:
 
-```{rust}
+```rust
 let x = 5i;
 
 match x {
@@ -1408,7 +1407,7 @@ We now loop forever with `loop`, and use `break` to break out early.
 `continue` is similar, but instead of ending the loop, goes to the next
 iteration: This will only print the odd numbers:
 
-```{rust}
+```
 for x in range(0i, 10i) {
     if x % 2 == 0 { continue; }
 
@@ -4123,7 +4122,7 @@ the ability to use this **method call syntax** via the `impl` keyword.
 
 Here's how it works:
 
-```{rust}
+```
 struct Circle {
     x: f64,
     y: f64,
@@ -4162,7 +4161,7 @@ multiplications later, and we have our area.
 You can also define methods that do not take a `self` parameter. Here's a
 pattern that's very common in Rust code:
 
-```{rust}
+```
 struct Circle {
     x: f64,
     y: f64,

branches/auto/src/doc/index.md

@@ -43,10 +43,6 @@ discussion about Rust.
 There is also a [developer forum](http://discuss.rust-lang.org/), where the
 development of Rust itself is discussed.
 
-# Specification
-
-Rust does not have an exact specification, but an effort to describe as much of
-the language in as much detail as possible is in [the manual](rust.html).
 
 # Guides