---

yaml
---
r: 153566
b: refs/heads/try2
c: 56fafe2
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6f99a27886023acf4d10efb4d56c89c88ffee9be
+refs/heads/try2: 56fafe28ee17a4aa48795083ee08be744f068067
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

@@ -30,7 +30,7 @@ DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
 	guide-tasks guide-container guide-pointers guide-testing \
 	guide-runtime complement-bugreport \
 	complement-lang-faq complement-design-faq complement-project-faq rust \
-    rustdoc guide-unsafe
+    rustdoc guide-unsafe guide-strings
 
 PDF_DOCS := tutorial rust
 

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

@@ -1,7 +1,5 @@
 % The Strings Guide
 
-# Strings
-
 Strings are an important concept to master in any programming language. If you
 come from a managed language background, you may be surprised at the complexity
 of string handling in a systems programming language. Efficient access and
@@ -14,7 +12,7 @@ Additionally, strings are not null-terminated and can contain null bytes.
 
 Rust has two main types of strings: `&str` and `String`.
 
-## &str
+# &str
 
 The first kind is a `&str`. This is pronounced a 'string slice.' String literals
 are of the type `&str`:
@@ -38,7 +36,7 @@ Like vector slices, string slices are simply a pointer plus a length. This
 means that they're a 'view' into an already-allocated string, such as a
 `&'static str` or a `String`.
 
-## String
+# String
 
 A `String` is a heap-allocated string. This string is growable, and is also
 guaranteed to be UTF-8.
@@ -73,9 +71,9 @@ let x: &[u8] = &[b'a', b'b'];
 let stack_str: &str = str::from_utf8(x).unwrap();
 ```
 
-## Best Practices
+# Best Practices
 
-### `String` vs. `&str`
+## `String` vs. `&str`
 
 In general, you should prefer `String` when you need ownership, and `&str` when
 you just need to borrow a string. This is very similar to using `Vec<T>` vs. `&[T]`,
@@ -98,7 +96,7 @@ 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
+## Comparisons
 
 To compare a String to a constant string, prefer `as_slice()`...
 
@@ -123,7 +121,7 @@ fn compare(string: String) {
 Converting a `String` to a `&str` is cheap, but converting the `&str` to a
 `String` involves an allocation.
 
-## Other Documentation
+# Other Documentation
 
 * [the `&str` API documentation](/std/str/index.html)
 * [the `String` API documentation](std/string/index.html)

branches/try2/src/doc/index.md

@@ -13,6 +13,7 @@ li {list-style-type: none; }
 
 # Guides
 
+* [Strings](guide-strings.html)
 * [Pointers](guide-pointers.html)
 * [References and Lifetimes](guide-lifetimes.html)
 * [Containers and Iterators](guide-container.html)

branches/try2/src/librustc/lib.rs

@@ -68,42 +68,42 @@ pub mod back {
 }
 
 pub mod middle {
-    pub mod def;
-    pub mod trans;
-    pub mod ty;
-    pub mod ty_fold;
-    pub mod subst;
-    pub mod resolve;
-    pub mod resolve_lifetime;
-    pub mod typeck;
+    pub mod astencode;
+    pub mod borrowck;
+    pub mod cfg;
+    pub mod check_const;
     pub mod check_loop;
     pub mod check_match;
-    pub mod check_const;
     pub mod check_static;
-    pub mod borrowck;
+    pub mod const_eval;
     pub mod dataflow;
-    pub mod mem_categorization;
-    pub mod liveness;
-    pub mod kind;
+    pub mod dead;
+    pub mod def;
+    pub mod dependency_format;
+    pub mod effect;
+    pub mod entry;
+    pub mod expr_use_visitor;
     pub mod freevars;
-    pub mod pat_util;
-    pub mod region;
-    pub mod const_eval;
-    pub mod astencode;
+    pub mod graph;
+    pub mod intrinsicck;
+    pub mod kind;
     pub mod lang_items;
+    pub mod liveness;
+    pub mod mem_categorization;
+    pub mod pat_util;
     pub mod privacy;
-    pub mod entry;
-    pub mod effect;
     pub mod reachable;
-    pub mod graph;
-    pub mod cfg;
-    pub mod dead;
-    pub mod expr_use_visitor;
-    pub mod dependency_format;
-    pub mod weak_lang_items;
+    pub mod region;
+    pub mod resolve;
+    pub mod resolve_lifetime;
     pub mod save;
-    pub mod intrinsicck;
     pub mod stability;
+    pub mod subst;
+    pub mod trans;
+    pub mod ty;
+    pub mod ty_fold;
+    pub mod typeck;
+    pub mod weak_lang_items;
 }
 
 pub mod front {