Skip to content

Commit 40b046e

Browse files
committed
---
yaml --- r: 162552 b: refs/heads/try c: 6b5655c h: refs/heads/master v: v3
1 parent aeb6e88 commit 40b046e

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 9146a919b616e39e528e4d7100d16eef52f1f852
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cafe2966770ff377aad6dd9fd808e68055587c58
5-
refs/heads/try: 2f0249b3a86247c7c1e52f17ccdc46346738d1e1
5+
refs/heads/try: 6b5655cb84284f30b7c6a00dff82546d83abeeca
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustdoc/clean/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1923,7 +1923,7 @@ impl Clean<ViewItemInner> for ast::ViewItem_ {
19231923

19241924
#[deriving(Clone, Encodable, Decodable)]
19251925
pub enum ViewPath {
1926-
// use str = source;
1926+
// use source as str;
19271927
SimpleImport(String, ImportSource),
19281928
// use source::*;
19291929
GlobImport(ImportSource),

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,12 +1582,14 @@ fn item_module(w: &mut fmt::Formatter, cx: &Context,
15821582
clean::ViewItemItem(ref item) => {
15831583
match item.inner {
15841584
clean::ExternCrate(ref name, ref src, _) => {
1585-
try!(write!(w, "<tr><td><code>extern crate {}",
1586-
name.as_slice()));
15871585
match *src {
1588-
Some(ref src) => try!(write!(w, " = \"{}\"",
1589-
src.as_slice())),
1590-
None => {}
1586+
Some(ref src) =>
1587+
try!(write!(w, "<tr><td><code>extern crate \"{}\" as {}",
1588+
src.as_slice(),
1589+
name.as_slice())),
1590+
None =>
1591+
try!(write!(w, "<tr><td><code>extern crate {}",
1592+
name.as_slice())),
15911593
}
15921594
try!(write!(w, ";</code></td></tr>"));
15931595
}

0 commit comments

Comments
 (0)