diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-03-12 10:31:52 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-03-12 15:01:27 -0700 |
| commit | 3f2434eee3f7fa72bf7a8693aef3932d563cf8d5 (patch) | |
| tree | 541bf3eb9112d8e40475b90f6da342980bbde7f8 | |
| parent | 1a7e55f4f55d0dd0afdd04bfb2bd0f27ba0b18f4 (diff) | |
| download | rust-3f2434eee3f7fa72bf7a8693aef3932d563cf8d5.tar.gz rust-3f2434eee3f7fa72bf7a8693aef3932d563cf8d5.zip | |
Test fixes from rolling up PRs
Closes #12803 (std: Relax an assertion in oneshot selection) r=brson Closes #12818 (green: Fix a scheduler assertion on yielding) r=brson Closes #12819 (doc: discuss try! in std::io) r=alexcrichton Closes #12820 (Use generic impls for `Hash`) r=alexcrichton Closes #12826 (Remove remaining nolink usages) r=alexcrichton Closes #12835 (Emacs: always jump the cursor if needed on indent) r=brson Closes #12838 (Json method cleanup) r=alexcrichton Closes #12843 (rustdoc: whitelist the headers that get a ยง on hover) r=alexcrichton Closes #12844 (docs: add two unlisted libraries to the index page) r=pnkfelix Closes #12846 (Added a test that checks that unary structs can be mutably borrowed) r=sfackler Closes #12847 (mk: Fix warnings about duplicated rules) r=nmatsakis
| -rw-r--r-- | mk/docs.mk | 4 | ||||
| -rw-r--r-- | src/test/run-pass/issue-11267.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/docs.mk b/mk/docs.mk index 94119576307..5b9e8407a58 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -148,8 +148,8 @@ endef $(foreach docname,$(PDF_DOCS),$(eval $(call DEF_SHOULD_BUILD_PDF_DOC,$(docname)))) doc/footer.tex: $(D)/footer.inc | doc/ - @$$(call E, pandoc: $$@) - $$(CFG_PANDOC) --from=html --to=latex $$< --output=$$@ + @$(call E, pandoc: $@) + $(CFG_PANDOC) --from=html --to=latex $< --output=$@ define DEF_DOC diff --git a/src/test/run-pass/issue-11267.rs b/src/test/run-pass/issue-11267.rs index 15403f5df81..53659a72132 100644 --- a/src/test/run-pass/issue-11267.rs +++ b/src/test/run-pass/issue-11267.rs @@ -20,6 +20,6 @@ fn do_something_with(a : &mut Iterator<int>) { println!("{}", a.next()) } -fn main() { +pub fn main() { do_something_with(&mut Empty); -} \ No newline at end of file +} |