---

yaml
---
r: 94039
b: refs/heads/try
c: 6600ba9
h: refs/heads/master
i:
  94037: 1a70a3c
  94035: 52cbdc9
  94031: 2631aec
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: f1ef36ea2ffcb3af7ea76b323f8cb47670fd243c
+refs/heads/try: 6600ba97c352058b08e077f7ae64dc92f87fadb6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/rust.md

@@ -3225,32 +3225,6 @@ let bo: Binop = add;
 x = bo(5,7);
 ~~~~
 
-### Closure types
-
-The type of a closure mapping an input of type `A` to an output of type `B` is `|A| -> B`. A closure with no arguments or return values has type `||`.
-
-
-An example of creating and calling a closure:
-
-```rust
-let captured_var = 10; 
-
-let closure_no_args = || println!("captured_var={}", captured_var); 
-
-let closure_args = |arg: int| -> int {
-  println!("captured_var={}, arg={}", captured_var, arg); 
-  arg // Note lack of semicolon after 'arg'
-};
-
-fn call_closure(c1: ||, c2: |int| -> int) {
-  c1();
-  c2(2);
-}
-
-call_closure(closure_no_args, closure_args);
-
-```
-
 ### Object types
 
 Every trait item (see [traits](#traits)) defines a type with the same name as the trait.

branches/try/src/libextra/flate.rs

@@ -23,7 +23,7 @@ use std::vec;
 pub mod rustrt {
     use std::libc::{c_int, c_void, size_t};
 
-    #[link(name = "rustrt", kind = "static")]
+    #[link(name = "rustrt")]
     extern {
         pub fn tdefl_compress_mem_to_heap(psrc_buf: *c_void,
                                           src_buf_len: size_t,

branches/try/src/librustdoc/core.rs

@@ -51,6 +51,7 @@ fn get_ast_and_resolve(cpath: &Path,
         binary: @"rustdoc",
         maybe_sysroot: Some(@os::self_exe_path().unwrap().dir_path()),
         addl_lib_search_paths: @mut libs,
+        outputs: ~[driver::session::OutputDylib],
         .. (*rustc::driver::session::basic_options()).clone()
     };