Skip to content

Commit 60580d9

Browse files
borsbors
committed
---
yaml --- r: 149011 b: refs/heads/try2 c: c8759f6 h: refs/heads/master i: 149009: 0755c5d 149007: 434dbea v: v3
1 parent 10e7297 commit 60580d9

File tree

428 files changed

+4855
-1565
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

428 files changed

+4855
-1565
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8192f5508a1003f92258dad3fd3773d0daa26391
8+
refs/heads/try2: c8759f6b56735d444288661655527edbc5ac333f
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ src/.DS_Store
7575
/nd/
7676
/llvm/
7777
version.md
78-
*.tex
7978
keywords.md
8079
x86_64-apple-darwin/
8180
x86_64-unknown-linux-gnu/

‎branches/try2/mk/docs.mk

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ HTML_DEPS := doc/
1919

2020
BASE_DOC_OPTS := --standalone --toc --number-sections
2121
HTML_OPTS = $(BASE_DOC_OPTS) --to=html5 --section-divs --css=rust.css \
22-
--include-before-body=doc/version_info.html --include-in-header=doc/favicon.inc
23-
TEX_OPTS = $(BASE_DOC_OPTS) --include-before-body=doc/version.md --to=latex
22+
--include-before-body=doc/version_info.html \
23+
--include-in-header=doc/favicon.inc --include-after-body=doc/footer.inc
24+
TEX_OPTS = $(BASE_DOC_OPTS) --include-before-body=doc/version.md \
25+
--from=markdown --include-before-body=doc/footer.tex --to=latex
2426
EPUB_OPTS = $(BASE_DOC_OPTS) --to=epub
2527

2628
D := $(S)src/doc
@@ -55,12 +57,21 @@ doc/rust.css: $(D)/rust.css | doc/
5557
@$(call E, cp: $@)
5658
$(Q)cp -a $< $@ 2> /dev/null
5759

60+
HTML_DEPS += doc/favicon.inc
61+
doc/favicon.inc: $(D)/favicon.inc | doc/
62+
@$(call E, cp: $@)
63+
$(Q)cp -a $< $@ 2> /dev/null
64+
5865
doc/full-toc.inc: $(D)/full-toc.inc | doc/
5966
@$(call E, cp: $@)
6067
$(Q)cp -a $< $@ 2> /dev/null
6168

62-
HTML_DEPS += doc/favicon.inc
63-
doc/favicon.inc: $(D)/favicon.inc | doc/
69+
HTML_DEPS += doc/footer.inc
70+
doc/footer.inc: $(D)/footer.inc | doc/
71+
@$(call E, cp: $@)
72+
$(Q)cp -a $< $@ 2> /dev/null
73+
74+
doc/footer.tex: $(D)/footer.tex | doc/
6475
@$(call E, cp: $@)
6576
$(Q)cp -a $< $@ 2> /dev/null
6677

@@ -83,7 +94,7 @@ doc/rust.html: $(D)/rust.md doc/full-toc.inc $(HTML_DEPS) | doc/
8394
$(CFG_PANDOC) $(HTML_OPTS) --include-in-header=doc/full-toc.inc --output=$@
8495

8596
DOCS += doc/rust.tex
86-
doc/rust.tex: $(D)/rust.md doc/version.md | doc/
97+
doc/rust.tex: $(D)/rust.md doc/footer.tex doc/version.md | doc/
8798
@$(call E, pandoc: $@)
8899
$(Q)$(CFG_NODE) $(D)/prep.js $< | \
89100
$(CFG_PANDOC) $(TEX_OPTS) --output=$@
@@ -107,7 +118,7 @@ doc/tutorial.html: $(D)/tutorial.md $(HTML_DEPS)
107118
$(CFG_PANDOC) $(HTML_OPTS) --output=$@
108119

109120
DOCS += doc/tutorial.tex
110-
doc/tutorial.tex: $(D)/tutorial.md doc/version.md
121+
doc/tutorial.tex: $(D)/tutorial.md doc/footer.tex doc/version.md
111122
@$(call E, pandoc: $@)
112123
$(Q)$(CFG_NODE) $(D)/prep.js $< | \
113124
$(CFG_PANDOC) $(TEX_OPTS) --output=$@

‎branches/try2/mk/tests.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,11 @@ endif
116116

117117
# Run the compiletest runner itself under valgrind
118118
ifdef CTEST_VALGRIND
119-
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3))
119+
CFG_RUN_CTEST_$(1)=$$(RPATH_VAR$$(1)_T_$$(3)_H_$$(3)) \
120+
$$(call CFG_RUN_TEST_$$(CFG_BUILD),$$(2),$$(3))
120121
else
121-
CFG_RUN_CTEST_$(1)=$$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2))
122+
CFG_RUN_CTEST_$(1)=$$(RPATH_VAR$$(1)_T_$$(3)_H_$$(3)) \
123+
$$(call CFG_RUN_$$(CFG_BUILD),$$(TLIB$$(1)_T_$$(3)_H_$$(3)),$$(2))
122124
endif
123125

124126
endef
@@ -242,7 +244,6 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
242244
tidy:
243245
@$(call E, check: formatting)
244246
$(Q)find $(S)src -name '*.r[sc]' \
245-
| grep '^$(S)src/test' -v \
246247
| grep '^$(S)src/libuv' -v \
247248
| grep '^$(S)src/llvm' -v \
248249
| grep '^$(S)src/gyp' -v \

‎branches/try2/src/compiletest/runtest.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,7 @@ fn check_error_patterns(props: &TestProps,
442442
testfile: &Path,
443443
ProcRes: &ProcRes) {
444444
if props.error_patterns.is_empty() {
445-
testfile.display().with_str(|s| {
446-
fatal(~"no error pattern specified in " + s);
447-
})
445+
fatal(~"no error pattern specified in " + testfile.display().as_maybe_owned().as_slice());
448446
}
449447
450448
if ProcRes.status.success() {

‎branches/try2/src/doc/footer.inc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<footer><p>
2+
Copyright &copy; 2011-2014 The Rust Project Developers. Licensed under the
3+
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>
4+
or the <a href="http://opensource.org/licenses/MIT">MIT license</a>, at your option.
5+
</p><p>
6+
This file may not be copied, modified, or distributed except according to those terms.
7+
</p></footer>

‎branches/try2/src/doc/footer.tex

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright © 2011-2014 The Rust Project Developers. Licensed under the
2+
\href{http://www.apache.org/licenses/LICENSE-2.0}{Apache License,
3+
Version 2.0} or the \href{http://opensource.org/licenses/MIT}{MIT
4+
license}, at your option.
5+
6+
This file may not be copied, modified, or distributed except according
7+
to those terms.

‎branches/try2/src/doc/guide-runtime.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,7 @@ extern mod green;
236236
237237
#[start]
238238
fn start(argc: int, argv: **u8) -> int {
239-
green::start(argc, argv, proc() {
240-
main();
241-
})
239+
green::start(argc, argv, main)
242240
}
243241
244242
fn main() {}

‎branches/try2/src/doc/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ li {list-style-type: none; }
5151
# Tooling
5252

5353
* [The `rustdoc` manual](rustdoc.html)
54-
* [The `rustpkg` manual](rustpkg.html)
5554

5655
# FAQs
5756

‎branches/try2/src/doc/rust.css

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
body {
1616
margin: 0 auto;
1717
padding: 0 15px;
18-
margin-bottom: 4em;
1918
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
2019
font-size: 14px;
2120
color: #333;
@@ -76,6 +75,15 @@ p {
7675
margin: 0 0 10px;
7776
}
7877

78+
footer {
79+
border-top: 1px solid #ddd;
80+
font-size: 12px;
81+
font-style: italic;
82+
padding-top: 4px;
83+
margin-top: 4em;
84+
margin-bottom: 1em;
85+
}
86+
7987
/* Links layout
8088
========================================================================== */
8189
a {

0 commit comments

Comments
 (0)