Skip to content

Commit 855ef6b

Browse files
committed
---
yaml --- r: 6044 b: refs/heads/master c: da064ef h: refs/heads/master v: v3
1 parent a2e233d commit 855ef6b

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: e0abcf3cd5d59b00fca4e0d614332bb9044ec542
2+
refs/heads/master: da064ef884994df1889d6a083349fb0bf6954400

trunk/src/comp/metadata/creader.rs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,13 @@ fn metadata_matches(crate_data: @[u8], metas: [@ast::meta_item]) -> bool {
8888
log #fmt["matching %u metadata requirements against %u items",
8989
vec::len(metas), vec::len(linkage_metas)];
9090

91+
log #fmt("crate metadata:");
92+
for have: @ast::meta_item in linkage_metas {
93+
log #fmt(" %s", pprust::meta_item_to_str(*have));
94+
}
95+
9196
for needed: @ast::meta_item in metas {
97+
log #fmt["looking for %s", pprust::meta_item_to_str(*needed)];
9298
if !attr::contains(linkage_metas, needed) {
9399
log #fmt["missing %s", pprust::meta_item_to_str(*needed)];
94100
ret false;
@@ -147,12 +153,14 @@ fn find_library_crate_aux(nn: {prefix: str, suffix: str}, crate_name: str,
147153
let suffix: str = nn.suffix;
148154

149155
ret filesearch::search(filesearch, { |path|
156+
log #fmt("inspecting file %s", path);
150157
let f: str = fs::basename(path);
151158
if !(str::starts_with(f, prefix) && str::ends_with(f, suffix)) {
152159
log #fmt["skipping %s, doesn't look like %s*%s", path, prefix,
153160
suffix];
154161
option::none
155162
} else {
163+
log #fmt("%s is a candidate", path);
156164
alt get_metadata_section(path) {
157165
option::some(cvec) {
158166
if !metadata_matches(cvec, metas) {
@@ -163,7 +171,10 @@ fn find_library_crate_aux(nn: {prefix: str, suffix: str}, crate_name: str,
163171
option::some({ident: path, data: cvec})
164172
}
165173
}
166-
_ { option::none }
174+
_ {
175+
log #fmt("could not load metadata for %s", path);
176+
option::none
177+
}
167178
}
168179
}
169180
});

0 commit comments

Comments
 (0)