---

yaml
---
r: 146556
b: refs/heads/try2
c: 46100c0
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: 7407bcc1a2aa46949d3dadd1d9b79c76ad18d4cf
+refs/heads/try2: 46100c06223f737a7604b46667800ed42cf20d3b
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/.gitignore

@@ -30,6 +30,7 @@
 *.cps
 *.log
 *.pdf
+*.epub
 *.html
 *.pg
 *.toc

branches/try2/mk/clean.mk

@@ -53,7 +53,7 @@ clean-misc:
 	$(Q)rm -Rf tmp/*
 	$(Q)rm -Rf rust-stage0-*.tar.bz2 $(PKG_NAME)-*.tar.gz dist
 	$(Q)rm -Rf $(foreach ext, \
-                 html aux cp fn ky log pdf pg toc tp vr cps, \
+                 html aux cp fn ky log pdf pg toc tp vr cps epub, \
                  $(wildcard doc/*.$(ext)))
 	$(Q)find doc/std doc/extra -mindepth 1 | xargs rm -Rf
 	$(Q)rm -Rf doc/version.md

branches/try2/mk/docs.mk

@@ -64,6 +64,20 @@ doc/rust.tex: rust.md doc/version.md
          --from=markdown --to=latex \
          --output=$@
 
+DOCS += doc/rust.epub
+doc/rust.epub: rust.md doc/version_info.html doc/rust.css doc/manual.inc
+	@$(call E, pandoc: $@)
+	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
+	"$(CFG_PANDOC)" \
+         --standalone --toc \
+         --section-divs \
+         --number-sections \
+         --from=markdown --to=epub \
+         --css=rust.css --include-in-header=doc/manual.inc \
+         --include-before-body=doc/version_info.html \
+         --output=$@
+
+
 DOCS += doc/tutorial.tex
 doc/tutorial.tex: tutorial.md doc/version.md
 	@$(call E, pandoc: $@)
@@ -98,6 +112,17 @@ doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css
            --include-before-body=doc/version_info.html \
            --output=$@
 
+DOCS += doc/tutorial.epub
+doc/tutorial.epub: tutorial.md doc/version_info.html doc/rust.css
+	@$(call E, pandoc: $@)
+	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
+          $(CFG_PANDOC) --standalone --toc \
+           --section-divs --number-sections \
+           --from=markdown --to=epub --css=rust.css \
+           --include-before-body=doc/version_info.html \
+           --output=$@
+
+
 DOCS_L10N += doc/l10n/ja/tutorial.html
 doc/l10n/ja/tutorial.html: doc/l10n/ja/tutorial.md doc/version_info.html doc/rust.css
 	@$(call E, pandoc: $@)

branches/try2/src/libextra/getopts.rs

@@ -142,7 +142,8 @@ pub struct Matches {
 }
 
 /// The type returned when the command line does not conform to the
-/// expected format. Pass this value to <fail_str> to get an error message.
+/// expected format. Call the `to_err_msg` method to retrieve the
+/// error as a string.
 #[deriving(Clone, Eq, ToStr)]
 #[allow(missing_doc)]
 pub enum Fail_ {

branches/try2/src/libstd/task/spawn.rs

@@ -661,7 +661,6 @@ pub fn spawn_raw(mut opts: TaskOpts, f: ~fn()) {
                 };
                 new_sched.bootstrap(bootstrap_task);
 
-                debug!("enqueing join_task");
                 // Now tell the original scheduler to join with this thread
                 // by scheduling a thread-joining task on the original scheduler
                 orig_sched_handle.send(TaskFromFriend(join_task));

branches/try2/src/test/run-pass/spawning-with-debug.rs

@@ -0,0 +1,22 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// exec-env:RUST_LOG=debug
+// xfail-fast
+
+// regression test for issue #10405, make sure we don't call debug! too soon.
+
+use std::task;
+
+fn main() {
+    let mut t = task::task();
+    t.sched_mode(task::SingleThreaded);
+    t.spawn(|| ());
+}