---

yaml
---
r: 149017
b: refs/heads/try2
c: b029a18
h: refs/heads/master
i:
  149015: 0364bee
v: v3

Author: huonw

[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: a2290db7971a1e14e4d15316cecaf5c33cc6b0ba
+refs/heads/try2: b029a188205b704fed28d4fbe0037a453ace0ea1
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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/try2/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);