Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3f2434e

Browse files
committedMar 12, 2014
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
1 parent 1a7e55f commit 3f2434e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed
 

‎mk/docs.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ endef
148148
$(foreach docname,$(PDF_DOCS),$(eval $(call DEF_SHOULD_BUILD_PDF_DOC,$(docname))))
149149

150150
doc/footer.tex: $(D)/footer.inc | doc/
151-
@$$(call E, pandoc: $$@)
152-
$$(CFG_PANDOC) --from=html --to=latex $$< --output=$$@
151+
@$(call E, pandoc: $@)
152+
$(CFG_PANDOC) --from=html --to=latex $< --output=$@
153153

154154
define DEF_DOC
155155

‎src/test/run-pass/issue-11267.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ fn do_something_with(a : &mut Iterator<int>) {
2020
println!("{}", a.next())
2121
}
2222

23-
fn main() {
23+
pub fn main() {
2424
do_something_with(&mut Empty);
25-
}
25+
}

5 commit comments

Comments
 (5)

bors commented on Mar 12, 2014

@bors
Collaborator

saw approval from alexcrichton
at alexcrichton@3f2434e

bors commented on Mar 12, 2014

@bors
Collaborator

merging alexcrichton/rust/rollup = 3f2434e into auto

bors commented on Mar 12, 2014

@bors
Collaborator

alexcrichton/rust/rollup = 3f2434e merged ok, testing candidate = 4d64441

bors commented on Mar 12, 2014

@bors
Collaborator

bors commented on Mar 12, 2014

@bors
Collaborator

fast-forwarding master to auto = 4d64441

Please sign in to comment.