Skip to content

Commit e54df38

Browse files
committed
---
yaml --- r: 151135 b: refs/heads/try2 c: a692e9b h: refs/heads/master i: 151133: c2df801 151131: fe4ea12 151127: 49298ac 151119: d7a4f17 151103: aa2e817 v: v3
1 parent ace39d4 commit e54df38

File tree

15 files changed

+139
-111
lines changed

15 files changed

+139
-111
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: 34c88ef4d6bf13d06ee469c4cc4b18d64a9c83f0
8+
refs/heads/try2: a692e9b1234ff6573b0cfbc39394d9222eb38f81
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/docs.mk

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,26 @@ doc/footer.inc: $(D)/footer.inc | doc/
141141
@$(call E, cp: $@)
142142
$(Q)cp -a $< $@ 2> /dev/null
143143

144+
doc/FiraSans-Regular.woff: $(D)/FiraSans-Regular.woff | doc/
145+
@$(call E, cp: $@)
146+
$(Q)cp -a $< $@ 2> /dev/null
147+
148+
doc/FiraSans-Medium.woff: $(D)/FiraSans-Medium.woff | doc/
149+
@$(call E, cp: $@)
150+
$(Q)cp -a $< $@ 2> /dev/null
151+
152+
doc/Heuristica-Regular.woff: $(D)/Heuristica-Regular.woff | doc/
153+
@$(call E, cp: $@)
154+
$(Q)cp -a $< $@ 2> /dev/null
155+
156+
doc/Heuristica-Italic.woff: $(D)/Heuristica-Italic.woff | doc/
157+
@$(call E, cp: $@)
158+
$(Q)cp -a $< $@ 2> /dev/null
159+
160+
doc/Heuristica-Bold.woff: $(D)/Heuristica-Bold.woff | doc/
161+
@$(call E, cp: $@)
162+
$(Q)cp -a $< $@ 2> /dev/null
163+
144164
# The (english) documentation for each doc item.
145165

146166
define DEF_SHOULD_BUILD_PDF_DOC
87.8 KB
Binary file not shown.
89.8 KB
Binary file not shown.
120 KB
Binary file not shown.
117 KB
Binary file not shown.
157 KB
Binary file not shown.

branches/try2/src/doc/complement-cheatsheet.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -207,12 +207,12 @@ let _ = close(Door::<Closed>("front".to_owned())); // error: mismatched types: e
207207
208208
## C function signature conversions
209209
210-
Description C signature Equivalent Rust signature
211-
---------------------- ---------------------------------------------- ------------------------------------------
212-
no parameters `void foo(void);` `fn foo();`
213-
return value `int foo(void);` `fn foo() -> c_int;`
214-
function parameters `void foo(int x, int y);` `fn foo(x: c_int, y: c_int);`
215-
in-out pointers `void foo(const int* in_ptr, int* out_ptr);` `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);`
210+
| Description | C signature | Equivalent Rust signature |
211+
|---------------------|-----------------------------------------------|------------------------------------------------|
212+
| no parameters | `void foo(void);` | `fn foo();` |
213+
| return value | `int foo(void);` | `fn foo() -> c_int;` |
214+
| function parameters | `void foo(int x, int y);` | `fn foo(x: c_int, y: c_int);` |
215+
| in-out pointers | `void foo(const int* in_ptr, int* out_ptr);` | `fn foo(in_ptr: *c_int, out_ptr: *mut c_int);` |
216216
217217
Note: The Rust signatures should be wrapped in an `extern "ABI" { ... }` block.
218218

branches/try2/src/doc/favicon.inc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico" />
1+
<link rel="shortcut icon" href="http://www.rust-lang.org/favicon.ico">
2+
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400'
3+
rel='stylesheet' type='text/css'>

branches/try2/src/doc/guide-container.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ just unique keys without a corresponding value. The `Map` and `Set` traits in
2222

2323
The standard library provides three owned map/set types:
2424

25-
* `std::hashmap::HashMap` and `std::hashmap::HashSet`, requiring the keys to
25+
* `collections::HashMap` and `collections::HashSet`, requiring the keys to
2626
implement `Eq` and `Hash`
27-
* `std::trie::TrieMap` and `std::trie::TrieSet`, requiring the keys to be `uint`
28-
* `extra::treemap::TreeMap` and `extra::treemap::TreeSet`, requiring the keys
27+
* `collections::TrieMap` and `collections::TrieSet`, requiring the keys to be `uint`
28+
* `collections::TreeMap` and `collections::TreeSet`, requiring the keys
2929
to implement `TotalOrd`
3030

3131
These maps do not use managed pointers so they can be sent between tasks as
@@ -42,19 +42,19 @@ implementing the `Hash` trait.
4242

4343
## Double-ended queues
4444

45-
The `extra::ringbuf` module implements a double-ended queue with `O(1)`
45+
The `collections::ringbuf` module implements a double-ended queue with `O(1)`
4646
amortized inserts and removals from both ends of the container. It also has
4747
`O(1)` indexing like a vector. The contained elements are not required to be
4848
copyable, and the queue will be sendable if the contained type is sendable.
49-
Its interface `Deque` is defined in `extra::collections`.
49+
Its interface `Deque` is defined in `collections`.
5050

5151
The `extra::dlist` module implements a double-ended linked list, also
5252
implementing the `Deque` trait, with `O(1)` removals and inserts at either end,
5353
and `O(1)` concatenation.
5454

5555
## Priority queues
5656

57-
The `extra::priority_queue` module implements a queue ordered by a key. The
57+
The `collections::priority_queue` module implements a queue ordered by a key. The
5858
contained elements are not required to be copyable, and the queue will be
5959
sendable if the contained type is sendable.
6060

branches/try2/src/doc/rust.css

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,41 @@
1414
font-family: 'Fira Sans';
1515
font-style: normal;
1616
font-weight: 400;
17-
src: local('Fira Sans'), url("http://www.rust-lang.org/fonts/FiraSans-Regular.woff") format('woff');
17+
src: local('Fira Sans'), url("FiraSans-Regular.woff") format('woff');
1818
}
1919
@font-face {
2020
font-family: 'Fira Sans';
2121
font-style: normal;
2222
font-weight: 500;
23-
src: local('Fira Sans Medium'), url("http://www.rust-lang.org/fonts/FiraSans-Medium.woff") format('woff');
23+
src: local('Fira Sans Medium'), url("FiraSans-Medium.woff") format('woff');
2424
}
2525
@font-face {
2626
font-family: 'Heuristica';
2727
font-style: normal;
2828
font-weight: 400;
29-
src: local('Heuristica Regular'), url("http://www.rust-lang.org/fonts/Heuristica-Regular.woff") format('woff');
29+
src: local('Heuristica Regular'), url("Heuristica-Regular.woff") format('woff');
3030
}
3131
@font-face {
3232
font-family: 'Heuristica';
3333
font-style: italic;
3434
font-weight: 400;
35-
src: local('Heuristica Italic'), url("http://www.rust-lang.org/fonts/Heuristica-Italic.woff") format('woff');
35+
src: local('Heuristica Italic'), url("Heuristica-Italic.woff") format('woff');
3636
}
3737
@font-face {
3838
font-family: 'Heuristica';
3939
font-style: normal;
4040
font-weight: 700;
41-
src: local('Heuristica Bold'), url("http://www.rust-lang.org/fonts/Heuristica-Bold.woff") format('woff');
41+
src: local('Heuristica Bold'), url("Heuristica-Bold.woff") format('woff');
4242
}
43-
/* Global page semantics
44-
========================================================================== */
43+
44+
*:not(body) {
45+
-webkit-box-sizing: border-box;
46+
-moz-box-sizing: border-box;
47+
box-sizing: border-box;
48+
}
49+
50+
/* General structure */
51+
4552
body {
4653
margin: 0 auto;
4754
padding: 0 15px;
@@ -71,16 +78,6 @@ h1, h2, h3 {
7178
h1 {
7279
margin-bottom: 20px;
7380
}
74-
@media (min-width: 1170px) {
75-
h1 {
76-
margin-top: 40px;
77-
margin-bottom: 30px;
78-
}
79-
h1, h2, h3 {
80-
margin-top: 30px;
81-
margin-bottom: 15px;
82-
}
83-
}
8481
h4, h5, h6 {
8582
margin-top: 12px;
8683
margin-bottom: 10px;
@@ -157,8 +154,8 @@ footer {
157154
margin-bottom: 1em;
158155
}
159156

160-
/* Links layout
161-
========================================================================== */
157+
/* Links layout */
158+
162159
a {
163160
text-decoration: none;
164161
color: #428BCA;
@@ -183,18 +180,16 @@ h5 a:link, h5 a:visited {color: black;}
183180
h1 a:hover, h2 a:hover, h3 a:hover, h4 a:hover,
184181
h5 a:hover {text-decoration: none;}
185182

186-
/* Code
187-
========================================================================== */
183+
/* Code */
184+
188185
pre, code {
189-
font-family: Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
190-
border-radius: 4px;
186+
font-family: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", monospace;
191187
}
192188
pre {
193-
background-color: #FDFDFD;
194-
border: 1px solid #CCC;
195-
border-radius: 0.5em;
189+
border-left: 2px solid #eee;
196190
white-space: pre-wrap;
197-
padding: 9.5px;
191+
padding: 14px;
192+
padding-right: 0;
198193
margin: 20px 0;
199194
font-size: 13px;
200195
word-break: break-all;
@@ -203,15 +198,12 @@ pre {
203198
code {
204199
padding: 0 2px;
205200
color: #8D1A38;
206-
white-space: nowrap;
201+
white-space: pre-wrap;
207202
}
208203
pre code {
209204
padding: 0;
210205
font-size: inherit;
211206
color: inherit;
212-
white-space: pre-wrap;
213-
background-color: transparent;
214-
border-radius: 0;
215207
}
216208

217209
/* Code highlighting */
@@ -225,16 +217,16 @@ pre.rust .doccomment { color: #4D4D4C; }
225217
pre.rust .macro, pre.rust .macro-nonterminal { color: #3E999F; }
226218
pre.rust .lifetime { color: #B76514; }
227219

220+
/* The rest */
228221

229-
/* The rest
230-
========================================================================== */
231222
#versioninfo {
232223
text-align: center;
233224
margin: 0.5em;
234225
font-size: 1.1em;
235226
}
236-
@media only screen and (min-width: 768px) {
227+
@media (min-width: 992px) {
237228
#versioninfo {
229+
font-size: 0.8em;
238230
position: fixed;
239231
bottom: 0px;
240232
right: 0px;
@@ -243,7 +235,7 @@ pre.rust .lifetime { color: #B76514; }
243235
background-color: #fff;
244236
margin: 2px;
245237
padding: 0 2px;
246-
border-radius: .3em;
238+
border-radius: .2em;
247239
}
248240
}
249241
#versioninfo a.hash {
@@ -252,10 +244,12 @@ pre.rust .lifetime { color: #B76514; }
252244
}
253245

254246
blockquote {
255-
color: black;
256-
border-left: 5px solid #eee;
257-
margin: 0 0 20px;
258-
padding: 10px 20px;
247+
color: #000;
248+
margin: 20px 0;
249+
padding: 15px 20px;
250+
background-color: #f2f7f9;
251+
border-top: .1em solid #e5eef2;
252+
border-bottom: .1em solid #e5eef2;
259253
}
260254
blockquote p {
261255
font-size: 17px;
@@ -319,6 +313,12 @@ table th {
319313
padding: 5px;
320314
}
321315

316+
@media (min-width: 1170px) {
317+
pre {
318+
font-size: 15px;
319+
}
320+
}
321+
322322
@media print {
323323
* {
324324
text-shadow: none !important;

branches/try2/src/librustdoc/html/layout.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ r##"<!DOCTYPE html>
3838
3939
<title>{title}</title>
4040
41-
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600'
41+
<link href='http://fonts.googleapis.com/css?family=Source+Code+Pro:400,600'
4242
rel='stylesheet' type='text/css'>
4343
<link rel="stylesheet" type="text/css" href="{root_path}main.css">
4444
45-
{favicon, select, none{} other{<link rel="shortcut icon" href="#" />}}
45+
{favicon, select, none{} other{<link rel="shortcut icon" href="#">}}
4646
</head>
4747
<body>
4848
<!--[if lte IE 8]>

branches/try2/src/librustdoc/html/render.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -924,19 +924,6 @@ impl<'a> Item<'a> {
924924

925925
impl<'a> fmt::Show for Item<'a> {
926926
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
927-
match attr::find_stability(self.item.attrs.iter()) {
928-
Some(ref stability) => {
929-
try!(write!(fmt.buf,
930-
"<a class='stability {lvl}' title='{reason}'>{lvl}</a>",
931-
lvl = stability.level.to_str(),
932-
reason = match stability.text {
933-
Some(ref s) => (*s).clone(),
934-
None => InternedString::new(""),
935-
}));
936-
}
937-
None => {}
938-
}
939-
940927
// Write the breadcrumb trail header for the top
941928
try!(write!(fmt.buf, "\n<h1 class='fqn'>"));
942929
match self.item.inner {
@@ -964,6 +951,21 @@ impl<'a> fmt::Show for Item<'a> {
964951
try!(write!(fmt.buf, "<a class='{}' href=''>{}</a>",
965952
shortty(self.item), self.item.name.get_ref().as_slice()));
966953

954+
// Write stability attributes
955+
match attr::find_stability(self.item.attrs.iter()) {
956+
Some(ref stability) => {
957+
try!(write!(fmt.buf,
958+
"<a class='stability {lvl}' title='{reason}'>{lvl}</a>",
959+
lvl = stability.level.to_str(),
960+
reason = match stability.text {
961+
Some(ref s) => (*s).clone(),
962+
None => InternedString::new(""),
963+
}));
964+
}
965+
None => {}
966+
}
967+
968+
// Write `src` tag
967969
if self.cx.include_sources {
968970
let mut path = Vec::new();
969971
clean_srcpath(self.item.source.filename.as_bytes(), |component| {

0 commit comments

Comments
 (0)