Skip to content

Commit 259f45e

Browse files
committed
---
yaml --- r: 30916 b: refs/heads/incoming c: 27a984e h: refs/heads/master v: v3
1 parent ff7f1ab commit 259f45e

28 files changed

+191
-225
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: db44dc5cf27d9e3ff2b16b18e9ea5ea5c273ff21
9+
refs/heads/incoming: 27a984e254b224222415429b13b11b352fdf54e0
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ endif
537537

538538
ifneq ($(findstring install,$(MAKECMDGOALS)),)
539539
ifdef DESTDIR
540-
CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR))
541-
CFG_PREFIX:=$(DESTDIR)
540+
CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)/$(CFG_PREFIX))
541+
CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX)
542542
export CFG_PREFIX
543543
endif
544544

branches/incoming/doc/rust.css

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
body {
22
padding: 1em;
33
margin: 0;
4-
margin-bottom: 4em;
54
font-family: "Helvetica Neue", Helvetica, sans-serif;
65
background-color: white;
76
color: black;
8-
line-height: 1.6em;
97
}
108

119
body {
@@ -14,16 +12,12 @@ body {
1412
}
1513

1614
h1 {
17-
font-size: 20pt;
15+
font-size: 22pt;
1816
margin-top: 2em;
19-
border-bottom: 1px solid silver;
20-
line-height: 1.6em;
17+
border-bottom: 2px solid silver;
2118
}
22-
h2 {
23-
font-size: 15pt;
24-
margin-top: 2em;
25-
}
26-
h3 { font-size: 13pt; }
19+
h2 { font-size: 17pt; }
20+
h3 { font-size: 14pt; }
2721

2822
pre {
2923
margin: 1.1em 0;
@@ -33,7 +27,7 @@ pre {
3327

3428
a, a:visited, a:link {
3529
text-decoration: none;
36-
color: rgb(0, 105, 214);
30+
color: #00438a;
3731
}
3832

3933
h1 a:link, h1 a:visited, h2 a:link, h2 a:visited,
@@ -60,12 +54,20 @@ h3 a:link, h3 a:visited { color: black; }
6054
.cm-s-default span.cm-tag {color: #170;}
6155
.cm-s-default span.cm-attribute {color: #00c;}
6256

57+
h1.title {
58+
background-image: url('http://www.rust-lang.org/logos/rust-logo-32x32-blk.png');
59+
background-repeat: no-repeat;
60+
background-position: right;
61+
}
62+
6363
#versioninfo {
6464
position: fixed;
6565
bottom: 0px;
6666
right: 0px;
6767

6868
background-color: white;
69+
border-left: solid 1px black;
70+
border-top: solid 1px black;
6971
padding: 0.5em;
7072
}
7173

@@ -97,8 +99,3 @@ td {
9799
#TOC ul ul {
98100
display: none;
99101
}
100-
101-
#TOC ul {
102-
list-style: none;
103-
padding-left: 0px;
104-
}

branches/incoming/src/libcore/core.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,9 @@ mod pipes;
248248

249249
// Runtime and language-primitive support
250250

251+
#[legacy_exports]
251252
mod gc;
253+
#[legacy_exports]
252254
mod io;
253255
mod libc;
254256
mod os;

0 commit comments

Comments
 (0)