Skip to content

Commit 58779ac

Browse files
committed
---
yaml --- r: 32979 b: refs/heads/dist-snap c: 1229d1c h: refs/heads/master i: 32977: 96b19b0 32975: 3cc4a9c v: v3
1 parent aba11e3 commit 58779ac

30 files changed

+249
-216
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: 27a984e254b224222415429b13b11b352fdf54e0
10+
refs/heads/dist-snap: 1229d1c2ce7cc97ec63a86668e0b12fabaa63e06
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/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)/$(CFG_PREFIX))
541-
CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX)
540+
CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR))
541+
CFG_PREFIX:=$(DESTDIR)
542542
export CFG_PREFIX
543543
endif
544544

branches/dist-snap/doc/rust.css

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

911
body {
@@ -12,12 +14,16 @@ body {
1214
}
1315

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

2228
pre {
2329
margin: 1.1em 0;
@@ -27,7 +33,7 @@ pre {
2733

2834
a, a:visited, a:link {
2935
text-decoration: none;
30-
color: #00438a;
36+
color: rgb(0, 105, 214);
3137
}
3238

3339
h1 a:link, h1 a:visited, h2 a:link, h2 a:visited,
@@ -54,20 +60,12 @@ h3 a:link, h3 a:visited { color: black; }
5460
.cm-s-default span.cm-tag {color: #170;}
5561
.cm-s-default span.cm-attribute {color: #00c;}
5662

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;
7169
padding: 0.5em;
7270
}
7371

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

branches/dist-snap/src/libcore/core.rc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,10 @@ mod either;
190190
#[legacy_exports]
191191
mod iter;
192192
mod logging;
193-
#[legacy_exports]
194193
mod option;
195194
#[path="iter-trait"]
196195
mod option_iter {
197-
#[legacy_exports];
198196
#[path = "option.rs"]
199-
#[legacy_exports]
200197
mod inst;
201198
}
202199
#[legacy_exports]
@@ -248,9 +245,7 @@ mod pipes;
248245

249246
// Runtime and language-primitive support
250247

251-
#[legacy_exports]
252248
mod gc;
253-
#[legacy_exports]
254249
mod io;
255250
mod libc;
256251
mod os;

0 commit comments

Comments
 (0)