Skip to content

Commit 82a74fc

Browse files
committed
Remove the last traces of the distinction between export / local meta items
Issue #487
1 parent dfcfef4 commit 82a74fc

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

src/comp/metadata/decoder.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,6 @@ fn list_meta_items(&ebml::doc meta_items, io::writer out) {
316316
fn list_crate_attributes(&ebml::doc md, io::writer out) {
317317
out.write_str("=Crate=");
318318

319-
// FIXME (#487): This is transitional until attributes are snapshotted
320-
out.write_str("old-style:\n");
321-
auto meta_items = ebml::get_doc(md, tag_meta_export);
322-
list_meta_items(meta_items, out);
323-
324319
for (ast::attribute attr in get_attributes(md)) {
325320
out.write_str(#fmt("%s", pprust::attribute_to_str(attr)));
326321
}

src/comp/metadata/encoder.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -457,32 +457,11 @@ fn encode_attributes(&ebml::writer ebml_w, &vec[attribute] attrs) {
457457
ebml::end_tag(ebml_w);
458458
}
459459

460-
// FIXME (#487): Transitional
461-
fn encode_meta_items(&ebml::writer ebml_w, &crate crate) {
462-
auto name = middle::attr::find_attrs_by_name(crate.node.attrs,
463-
"name");
464-
auto value = middle::attr::find_attrs_by_name(crate.node.attrs,
465-
"value");
466-
auto name_and_val = middle::attr::attr_metas(name + value);
467-
468-
ebml::start_tag(ebml_w, tag_meta_export);
469-
for (@meta_item mi in name_and_val) {
470-
encode_meta_item(ebml_w, *mi);
471-
}
472-
ebml::end_tag(ebml_w);
473-
ebml::start_tag(ebml_w, tag_meta_local);
474-
ebml::end_tag(ebml_w);
475-
}
476-
477460
fn encode_metadata(&@crate_ctxt cx, &@crate crate) -> str {
478461
auto string_w = io::string_writer();
479462
auto buf_w = string_w.get_writer().get_buf_writer();
480463
auto ebml_w = ebml::create_writer(buf_w);
481464

482-
// FIXME: This is the old way of encoding crate meta items
483-
// Remove after going through a snapshot cycle
484-
encode_meta_items(ebml_w, *crate);
485-
// Encode crate attributes
486465
encode_attributes(ebml_w, crate.node.attrs);
487466
// Encode and index the paths.
488467

src/comp/metadata/tags.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ const uint tag_index_buckets_bucket_elt = 0x14u;
4040

4141
const uint tag_index_table = 0x15u;
4242

43-
const uint tag_meta_export = 0x16u;
44-
45-
const uint tag_meta_local = 0x17u;
46-
4743
const uint tag_meta_item_name_value = 0x18u;
4844

4945
const uint tag_meta_item_name = 0x19u;

0 commit comments

Comments
 (0)