Skip to content

Commit 77042f5

Browse files
committed
---
yaml --- r: 191351 b: refs/heads/try c: 1fd38c1 h: refs/heads/master i: 191349: 81389e2 191347: 4a58833 191343: 0e1696f v: v3
1 parent a6391a8 commit 77042f5

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
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: 809a554fca2d0ebc2ba50077016fe282a4064752
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c64d671671aea2e44ee7fc6eb00ee75fc30ed7b9
5-
refs/heads/try: 2df1ceb001662845e14e210f22adfe02dd88112b
5+
refs/heads/try: 1fd38c181a5cadb854dd8eb22d1ba1b7f009a12f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/librustc_resolve/build_reduced_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> {
372372

373373
ItemExternCrate(_) => {
374374
// n.b. we don't need to look at the path option here, because cstore already did
375-
for &crate_id in self.session.cstore.find_extern_mod_stmt_cnum(item.id).iter() {
375+
if let Some(crate_id) = self.session.cstore.find_extern_mod_stmt_cnum(item.id) {
376376
let def_id = DefId { krate: crate_id, node: 0 };
377377
self.external_exports.insert(def_id);
378378
let parent_link = ModuleParentLink(parent.downgrade(), name);

branches/try/src/libsyntax/test.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,10 @@ impl<'a> fold::Folder for TestHarnessGenerator<'a> {
144144
// Make all tests public so we can call them from outside
145145
// the module (note that the tests are re-exported and must
146146
// be made public themselves to avoid privacy errors).
147-
let mut result = (*i).clone();
148-
result.vis = ast::Public;
149-
P(result)
147+
i.map(|mut i| {
148+
i.vis = ast::Public;
149+
i
150+
})
150151
}
151152
}
152153
} else {

0 commit comments

Comments
 (0)