Skip to content

Commit f09eb4b

Browse files
committed
---
yaml --- r: 14207 b: refs/heads/try c: fc023d9 h: refs/heads/master i: 14205: 31b52c1 14203: 1bcdf44 14199: 82c0ab5 14191: b2036dc 14175: e4eba97 14143: f7dc0af 14079: 959e38f v: v3
1 parent 9c1b554 commit f09eb4b

File tree

5 files changed

+3
-28
lines changed

5 files changed

+3
-28
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 2ec3a0b60833736a3c0d805768885b4392c36100
5+
refs/heads/try: fc023d91c77f468211ba9f7681b4d2a6469aac74
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/metadata/csearch.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ fn resolve_path(cstore: cstore::cstore, cnum: ast::crate_num,
6060
fn get_item_path(tcx: ty::ctxt, def: ast::def_id) -> ast_map::path {
6161
let cstore = tcx.sess.cstore;
6262
let cdata = cstore::get_crate_data(cstore, def.crate);
63-
let path = decoder::get_item_path(cdata, def.node);
64-
[ast_map::path_mod(cdata.name)] + path
63+
ret decoder::get_item_path(cdata, def.node);
6564
}
6665

6766
fn get_enum_variants(tcx: ty::ctxt, def: ast::def_id) -> [ty::variant_info] {

branches/try/src/comp/middle/ast_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn path_to_str_with_sep(p: path, sep: str) -> str {
1717
}
1818

1919
fn path_to_str(p: path) -> str {
20-
"::" + path_to_str_with_sep(p, "::")
20+
path_to_str_with_sep(p, "::")
2121
}
2222

2323
enum ast_node {

branches/try/src/test/compile-fail/fully-qualified-type-name1.rs

Lines changed: 0 additions & 7 deletions
This file was deleted.

branches/try/src/test/compile-fail/fully-qualified-type-name2.rs

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)