---

yaml
---
r: 103995
b: refs/heads/try
c: b029a18
h: refs/heads/master
i:
  103993: 38f6d4d
  103991: a695e52
v: v3

Author: huonw

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: a2290db7971a1e14e4d15316cecaf5c33cc6b0ba
+refs/heads/try: b029a188205b704fed28d4fbe0037a453ace0ea1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/mk/dist.mk

@@ -26,12 +26,19 @@ PKG_FILES := \
     $(S)man                                    \
     $(S)doc                                    \
     $(addprefix $(S)src/,                      \
-      README.md                                \
-      compiletest                              \
+      README.txt                               \
       driver                                   \
+      librustc                                 \
+      compiletest                              \
       etc                                      \
-      $(foreach crate,$(CRATES),lib$(crate))   \
+      libextra                                 \
+      libstd                                   \
+      libsyntax                                \
+      librustuv				       \
+      libgreen 				       \
+      libnative 			       \
       rt                                       \
+      librustdoc                               \
       rustllvm                                 \
       snapshots.txt                            \
       test)                                    \

branches/try/src/compiletest/runtest.rs

@@ -442,7 +442,9 @@ fn check_error_patterns(props: &TestProps,
                         testfile: &Path,
                         ProcRes: &ProcRes) {
     if props.error_patterns.is_empty() {
-        fatal(~"no error pattern specified in " + testfile.display().as_maybe_owned().as_slice());
+        testfile.display().with_str(|s| {
+            fatal(~"no error pattern specified in " + s);
+        })
     }
 
     if ProcRes.status.success() {

branches/try/src/doc/index.md

@@ -51,6 +51,7 @@ li {list-style-type: none; }
 # Tooling
 
 * [The `rustdoc` manual](rustdoc.html)
+* [The `rustpkg` manual](rustpkg.html)
 
 # FAQs
 

branches/try/src/etc/vim/syntax/rust.vim

@@ -87,7 +87,8 @@ syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive
 syn keyword rustTrait GenericPath Path PosixPath WindowsPath
 syn keyword rustTrait RawPtr
 syn keyword rustTrait Buffer Writer Reader Seek
-syn keyword rustTrait Str StrVector StrSlice OwnedStr IntoMaybeOwned
+syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr
+syn keyword rustTrait Str StrVector StrSlice OwnedStr
 syn keyword rustTrait IterBytes
 syn keyword rustTrait ToStr IntoStr
 syn keyword rustTrait CloneableTuple ImmutableTuple

branches/try/src/libextra/lib.rs

@@ -29,7 +29,7 @@ Rust extras are part of the standard Rust distribution.
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
       html_root_url = "http://static.rust-lang.org/doc/master")];
 
-#[feature(macro_rules, globs, managed_boxes)];
+#[feature(macro_rules, globs, managed_boxes, asm)];
 
 #[deny(non_camel_case_types)];
 #[deny(missing_doc)];

branches/try/src/libextra/test.rs

@@ -893,8 +893,8 @@ pub fn run_test(force_ignore: bool,
         spawn(proc() {
             let mut task = task::task();
             task.name(match desc.name {
-                DynTestName(ref name) => name.to_owned().into_maybe_owned(),
-                StaticTestName(name) => name.into_maybe_owned()
+                DynTestName(ref name) => SendStrOwned(name.clone()),
+                StaticTestName(name) => SendStrStatic(name),
             });
             let result_future = task.future_result();
             task.spawn(testfn);
@@ -1091,13 +1091,25 @@ impl MetricMap {
 
 // Benchmarking
 
+/// A function that is opaque to the optimiser, to allow benchmarks to
+/// pretend to use outputs to assist in avoiding dead-code
+/// elimination.
+///
+/// This function is a no-op, and does not even read from `dummy`.
+pub fn black_box<T>(dummy: T) {
+    // we need to "use" the argument in some way LLVM can't
+    // introspect.
+    unsafe {asm!("" : : "r"(&dummy))}
+}
+
+
 impl BenchHarness {
     /// Callback for benchmark functions to run in their body.
-    pub fn iter(&mut self, inner: ||) {
+    pub fn iter<T>(&mut self, inner: || -> T) {
         self.ns_start = precise_time_ns();
         let k = self.iterations;
         for _ in range(0u64, k) {
-            inner();
+            black_box(inner());
         }
         self.ns_end = precise_time_ns();
     }

branches/try/src/libgreen/lib.rs

@@ -257,7 +257,7 @@ pub fn run(main: proc()) -> int {
     let (port, chan) = Chan::new();
     let mut opts = TaskOpts::new();
     opts.notify_chan = Some(chan);
-    opts.name = Some("<main>".into_maybe_owned());
+    opts.name = Some(SendStrStatic("<main>"));
     pool.spawn(opts, main);
 
     // Wait for the main task to return, and set the process error code

branches/try/src/libgreen/task.rs

@@ -510,7 +510,7 @@ mod tests {
     #[test]
     fn smoke_opts() {
         let mut opts = TaskOpts::new();
-        opts.name = Some("test".into_maybe_owned());
+        opts.name = Some(SendStrStatic("test"));
         opts.stack_size = Some(20 * 4096);
         let (p, c) = Chan::new();
         opts.notify_chan = Some(c);

branches/try/src/libnative/task.rs

@@ -294,7 +294,7 @@ mod tests {
     #[test]
     fn smoke_opts() {
         let mut opts = TaskOpts::new();
-        opts.name = Some("test".into_maybe_owned());
+        opts.name = Some(SendStrStatic("test"));
         opts.stack_size = Some(20 * 4096);
         let (p, c) = Chan::new();
         opts.notify_chan = Some(c);

branches/try/src/librustc/back/link.rs

@@ -76,7 +76,7 @@ pub fn WriteOutputFile(
             let result = llvm::LLVMRustWriteOutputFile(
                     Target, PM, M, Output, FileType);
             if !result {
-                llvm_err(sess, ~"could not write output");
+                llvm_err(sess, ~"Could not write output");
             }
         })
     }
@@ -189,7 +189,7 @@ pub mod write {
             for pass in sess.opts.custom_passes.iter() {
                 pass.with_c_str(|s| {
                     if !llvm::LLVMRustAddPass(mpm, s) {
-                        sess.warn(format!("unknown pass {}, ignoring", *pass));
+                        sess.warn(format!("Unknown pass {}, ignoring", *pass));
                     }
                 })
             }
@@ -876,11 +876,11 @@ fn link_binary_output(sess: Session,
     let obj_is_writeable = is_writeable(&obj_filename);
     let out_is_writeable = is_writeable(&out_filename);
     if !out_is_writeable {
-        sess.fatal(format!("output file {} is not writeable -- check its permissions.",
+        sess.fatal(format!("Output file {} is not writeable -- check its permissions.",
                            out_filename.display()));
     }
     else if !obj_is_writeable {
-        sess.fatal(format!("object file {} is not writeable -- check its permissions.",
+        sess.fatal(format!("Object file {} is not writeable -- check its permissions.",
                            obj_filename.display()));
     }
 

branches/try/src/librustc/driver/driver.rs

@@ -1181,6 +1181,7 @@ mod test {
     use getopts::getopts;
     use syntax::attr;
     use syntax::attr::AttrMetaMethods;
+    use syntax::diagnostic;
 
     // When the user supplies --test we should implicitly supply --cfg test
     #[test]

branches/try/src/librustc/driver/session.rs

@@ -308,7 +308,7 @@ impl Session_ {
     // This exists to help with refactoring to eliminate impossible
     // cases later on
     pub fn impossible_case(&self, sp: Span, msg: &str) -> ! {
-        self.span_bug(sp, format!("impossible case reached: {}", msg));
+        self.span_bug(sp, format!("Impossible case reached: {}", msg));
     }
     pub fn verbose(&self) -> bool { self.debugging_opt(VERBOSE) }
     pub fn time_passes(&self) -> bool { self.debugging_opt(TIME_PASSES) }

branches/try/src/librustc/metadata/tydecode.rs

@@ -527,7 +527,7 @@ fn parse_sig(st: &mut PState, conv: conv_did) -> ty::FnSig {
     let variadic = match next(st) {
         'V' => true,
         'N' => false,
-        r => fail!(format!("bad variadic: {}", r)),
+        r => fail!(format!("Bad variadic: {}", r)),
     };
     let ret_ty = parse_ty(st, |x,y| conv(x,y));
     ty::FnSig {binder_id: id,

branches/try/src/librustc/metadata/tyencode.rs

@@ -195,7 +195,7 @@ fn enc_region(w: &mut MemWriter, cx: @ctxt, r: ty::Region) {
         }
         ty::ReInfer(_) => {
             // these should not crop up after typeck
-            cx.diag.handler().bug("cannot encode region variables");
+            cx.diag.handler().bug("Cannot encode region variables");
         }
     }
 }
@@ -320,7 +320,7 @@ fn enc_sty(w: &mut MemWriter, cx: @ctxt, st: &ty::sty) {
             enc_bare_fn_ty(w, cx, f);
         }
         ty::ty_infer(_) => {
-            cx.diag.handler().bug("cannot encode inference variable types");
+            cx.diag.handler().bug("Cannot encode inference variable types");
         }
         ty::ty_param(param_ty {idx: id, def_id: did}) => {
             mywrite!(w, "p{}|{}", (cx.ds)(did), id);
@@ -334,7 +334,7 @@ fn enc_sty(w: &mut MemWriter, cx: @ctxt, st: &ty::sty) {
             enc_substs(w, cx, substs);
             mywrite!(w, "]");
         }
-        ty::ty_err => fail!("shouldn't encode error type")
+        ty::ty_err => fail!("Shouldn't encode error type")
     }
 }
 

branches/try/src/librustc/middle/borrowck/gather_loans/lifetime.rs

@@ -215,7 +215,7 @@ impl<'a> GuaranteeLifetimeContext<'a> {
                 // the check above should fail for anything is not ReScope
                 self.bccx.tcx.sess.span_bug(
                     cmt_base.span,
-                    format!("cannot issue root for scope region: {:?}",
+                    format!("Cannot issue root for scope region: {:?}",
                          self.loan_region));
             }
         };

branches/try/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -496,7 +496,7 @@ impl<'a> GatherLoanCtxt<'a> {
                     ty::ReInfer(..) => {
                         self.tcx().sess.span_bug(
                             cmt.span,
-                            format!("invalid borrow lifetime: {:?}", loan_region));
+                            format!("Invalid borrow lifetime: {:?}", loan_region));
                     }
                 };
                 debug!("loan_scope = {:?}", loan_scope);
@@ -820,7 +820,7 @@ impl<'a> GatherLoanCtxt<'a> {
             _ => {
                 self.tcx().sess.span_bug(
                     pat.span,
-                    format!("type of slice pattern is not a slice"));
+                    format!("Type of slice pattern is not a slice"));
             }
         }
     }

branches/try/src/librustc/middle/borrowck/mod.rs

@@ -769,14 +769,14 @@ impl BorrowckCtxt {
                             }
                             _ => {
                                 self.tcx.sess.bug(
-                                    format!("loan path LpVar({:?}) maps to {:?}, not local",
+                                    format!("Loan path LpVar({:?}) maps to {:?}, not local",
                                         id, pat));
                             }
                         }
                     }
                     r => {
                         self.tcx.sess.bug(
-                            format!("loan path LpVar({:?}) maps to {:?}, not local",
+                            format!("Loan path LpVar({:?}) maps to {:?}, not local",
                                  id, r));
                     }
                 }

branches/try/src/librustc/middle/borrowck/move_data.rs

@@ -494,7 +494,7 @@ impl MoveData {
                         dfcx_assign.add_kill(kill_id, assignment_index);
                     }
                     LpExtend(..) => {
-                        tcx.sess.bug("var assignment for non var path");
+                        tcx.sess.bug("Var assignment for non var path");
                     }
                 }
             }

branches/try/src/librustc/middle/cfg/construct.rs

@@ -507,13 +507,13 @@ impl CFGBuilder {
                         }
                         self.tcx.sess.span_bug(
                             expr.span,
-                            format!("no loop scope for id {:?}", loop_id));
+                            format!("No loop scope for id {:?}", loop_id));
                     }
 
                     r => {
                         self.tcx.sess.span_bug(
                             expr.span,
-                            format!("bad entry `{:?}` in def_map for label", r));
+                            format!("Bad entry `{:?}` in def_map for label", r));
                     }
                 }
             }

branches/try/src/librustc/middle/check_match.rs

@@ -971,7 +971,7 @@ fn check_legality_of_move_bindings(cx: &MatchCheckCtxt,
                     _ => {
                         cx.tcx.sess.span_bug(
                             p.span,
-                            format!("binding pattern {} is \
+                            format!("Binding pattern {} is \
                                   not an identifier: {:?}",
                                  p.id, p.node));
                     }