Skip to content

Commit ca7defd

Browse files
committed
---
yaml --- r: 81375 b: refs/heads/snap-stage3 c: c0388cd h: refs/heads/master i: 81373: 5786bed 81371: 366db18 81367: 4099953 81359: 3a3f990 81343: e070d00 v: v3
1 parent 67cd73b commit ca7defd

File tree

27 files changed

+621
-1513
lines changed

27 files changed

+621
-1513
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: cdb7701434be0ee463fa1dcce7e92647c5b5828c
4+
refs/heads/snap-stage3: c0388cd69166f22c818eab21c40c0a37cc1d70a8
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/extra.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ Rust extras are part of the standard Rust distribution.
2626
url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
2727

2828
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
29-
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
30-
html_root_url = "http://static.rust-lang.org/doc/master")];
29+
html_favicon_url = "http://www.rust-lang.org/favicon.ico")];
3130

3231
#[comment = "Rust extras"];
3332
#[license = "MIT/ASL2"];

branches/snap-stage3/src/librustc/middle/astencode.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -880,13 +880,13 @@ fn encode_side_tables_for_ii(ecx: &e::EncodeContext,
880880
// Because the ast visitor uses @IdVisitingOperation, I can't pass in
881881
// ecx directly, but /I/ know that it'll be fine since the lifetime is
882882
// tied to the CrateContext that lives throughout this entire section.
883-
ast_util::visit_ids_for_inlined_item(ii, @SideTableEncodingIdVisitor {
883+
ast_util::visit_ids_for_inlined_item(ii, &SideTableEncodingIdVisitor {
884884
ecx_ptr: unsafe {
885885
cast::transmute(ecx)
886886
},
887887
new_ebml_w: new_ebml_w,
888888
maps: maps,
889-
} as @ast_util::IdVisitingOperation);
889+
});
890890
ebml_w.end_tag();
891891
}
892892

0 commit comments

Comments
 (0)