---

yaml
---
r: 153565
b: refs/heads/try2
c: 6f99a27
h: refs/heads/master
i:
  153563: b21bcc8
v: v3

Author: pcwalton

[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: 5e0a597a1a15e36ac7d855ca400e5add9d86716b
+refs/heads/try2: 6f99a27886023acf4d10efb4d56c89c88ffee9be
 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 guide-strings
+    rustdoc guide-unsafe
 
 PDF_DOCS := tutorial rust
 

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

@@ -1,5 +1,7 @@
 % 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
@@ -12,7 +14,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`:
@@ -36,7 +38,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.
@@ -71,9 +73,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]`,
@@ -96,7 +98,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()`...
 
@@ -121,7 +123,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,7 +13,6 @@ 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/libcollections/dlist.rs

@@ -87,12 +87,14 @@ impl<T> Rawlink<T> {
     }
 
     /// Convert the `Rawlink` into an Option value
-    fn resolve_immut(&self) -> Option<&T> {
-        unsafe { self.p.to_option() }
+    fn resolve_immut<'a>(&self) -> Option<&'a T> {
+        unsafe {
+            mem::transmute(self.p.to_option())
+        }
     }
 
     /// Convert the `Rawlink` into an Option value
-    fn resolve(&mut self) -> Option<&mut T> {
+    fn resolve<'a>(&mut self) -> Option<&'a mut T> {
         if self.p.is_null() {
             None
         } else {

branches/try2/src/libgraphviz/lib.rs

@@ -455,12 +455,12 @@ impl<'a> LabelText<'a> {
     }
 
     /// Puts `prefix` on a line above this label, with a blank line separator.
-    pub fn prefix_line(self, prefix: LabelText) -> LabelText {
+    pub fn prefix_line(self, prefix: LabelText) -> LabelText<'static> {
         prefix.suffix_line(self)
     }
 
     /// Puts `suffix` on a line below this label, with a blank line separator.
-    pub fn suffix_line(self, suffix: LabelText) -> LabelText {
+    pub fn suffix_line(self, suffix: LabelText) -> LabelText<'static> {
         let prefix = self.pre_escaped_content().into_string();
         let suffix = suffix.pre_escaped_content();
         EscStr(str::Owned(prefix.append(r"\n\n").append(suffix.as_slice())))

branches/try2/src/libgraphviz/maybe_owned_vec.rs

@@ -109,7 +109,7 @@ impl<'b,T> slice::Vector<T> for MaybeOwnedVector<'b,T> {
 }
 
 impl<'a,T> FromIterator<T> for MaybeOwnedVector<'a,T> {
-    fn from_iter<I:Iterator<T>>(iterator: I) -> MaybeOwnedVector<T> {
+    fn from_iter<I:Iterator<T>>(iterator: I) -> MaybeOwnedVector<'a,T> {
         // If we are building from scratch, might as well build the
         // most flexible variant.
         Growable(FromIterator::from_iter(iterator))

branches/try2/src/libgreen/sched.rs

@@ -959,13 +959,13 @@ impl CleanupJob {
 type UnsafeTaskReceiver = raw::Closure;
 trait ClosureConverter {
     fn from_fn(|&mut Scheduler, Box<GreenTask>|) -> Self;
-    fn to_fn(self) -> |&mut Scheduler, Box<GreenTask>|;
+    fn to_fn(self) -> |&mut Scheduler, Box<GreenTask>|:'static ;
 }
 impl ClosureConverter for UnsafeTaskReceiver {
     fn from_fn(f: |&mut Scheduler, Box<GreenTask>|) -> UnsafeTaskReceiver {
         unsafe { mem::transmute(f) }
     }
-    fn to_fn(self) -> |&mut Scheduler, Box<GreenTask>| {
+    fn to_fn(self) -> |&mut Scheduler, Box<GreenTask>|:'static {
         unsafe { mem::transmute(self) }
     }
 }

branches/try2/src/librustc/lib.rs

@@ -68,42 +68,42 @@ pub mod back {
 }
 
 pub mod middle {
-    pub mod astencode;
-    pub mod borrowck;
-    pub mod cfg;
-    pub mod check_const;
+    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 check_loop;
     pub mod check_match;
+    pub mod check_const;
     pub mod check_static;
-    pub mod const_eval;
+    pub mod borrowck;
     pub mod dataflow;
-    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 graph;
-    pub mod intrinsicck;
-    pub mod kind;
-    pub mod lang_items;
-    pub mod liveness;
     pub mod mem_categorization;
+    pub mod liveness;
+    pub mod kind;
+    pub mod freevars;
     pub mod pat_util;
+    pub mod region;
+    pub mod const_eval;
+    pub mod astencode;
+    pub mod lang_items;
     pub mod privacy;
+    pub mod entry;
+    pub mod effect;
     pub mod reachable;
-    pub mod region;
-    pub mod resolve;
-    pub mod resolve_lifetime;
+    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 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 {