---

yaml
---
r: 15214
b: refs/heads/try
c: ce216a5
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: cb2840bcafcc4e4255c10c74a20ccdec33bb9b63
+refs/heads/try: ce216a55336d1e45f43ad5f0f1a9bf7e8a85b895
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/back/link.rs

@@ -302,7 +302,7 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
         let mut vers: option<str> = none;
         let mut cmh_items: [@ast::meta_item] = [];
         let linkage_metas = attr::find_linkage_metas(c.node.attrs);
-        attr::require_unique_names(sess, linkage_metas);
+        attr::require_unique_names(sess.diagnostic(), linkage_metas);
         for meta: @ast::meta_item in linkage_metas {
             if attr::get_meta_item_name(meta) == "name" {
                 alt attr::get_meta_item_value_str(meta) {

branches/try/src/rustc/front/attr.rs

@@ -4,7 +4,7 @@ import std::map;
 import std::map::hashmap;
 import either::either;
 import syntax::{ast, ast_util};
-import driver::session::session;
+import driver::diagnostic::span_handler;
 
 export attr_meta;
 export attr_metas;
@@ -220,13 +220,14 @@ fn remove_meta_items_by_name(items: [@ast::meta_item], name: str) ->
     ret vec::filter_map(items, filter);
 }
 
-fn require_unique_names(sess: session, metas: [@ast::meta_item]) {
+fn require_unique_names(diagnostic: span_handler,
+                        metas: [@ast::meta_item]) {
     let map = map::str_hash();
     for meta: @ast::meta_item in metas {
         let name = get_meta_item_name(meta);
         if map.contains_key(name) {
-            sess.span_fatal(meta.span,
-                            #fmt["duplicate meta item `%s`", name]);
+            diagnostic.span_fatal(meta.span,
+                                  #fmt["duplicate meta item `%s`", name]);
         }
         map.insert(name, ());
     }

branches/try/src/rustc/metadata/creader.rs

@@ -137,7 +137,7 @@ fn find_library_crate(sess: session::session, ident: ast::ident,
                       metas: [@ast::meta_item])
    -> option<{ident: str, data: @[u8]}> {
 
-    attr::require_unique_names(sess, metas);
+    attr::require_unique_names(sess.diagnostic(), metas);
     let metas = metas;
 
     let crate_name =