@@ -14,7 +14,6 @@ use std::collections::BTreeMap;
1414use ast;
1515use ast:: { Ident , Name , TokenTree } ;
1616use codemap:: Span ;
17- use diagnostics:: metadata:: { check_uniqueness, output_metadata, Duplicate } ;
1817use ext:: base:: { ExtCtxt , MacEager , MacResult } ;
1918use ext:: build:: AstBuilder ;
2019use parse:: token;
@@ -148,7 +147,7 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt,
148147 token_tree : & [ TokenTree ] )
149148 -> Box < MacResult +' cx > {
150149 assert_eq ! ( token_tree. len( ) , 3 ) ;
151- let ( crate_name , name) = match ( & token_tree[ 0 ] , & token_tree[ 2 ] ) {
150+ let ( _crate_name , name) = match ( & token_tree[ 0 ] , & token_tree[ 2 ] ) {
152151 (
153152 // Crate name.
154153 & ast:: TtToken ( _, token:: Ident ( ref crate_name, _) ) ,
@@ -158,21 +157,9 @@ pub fn expand_build_diagnostic_array<'cx>(ecx: &'cx mut ExtCtxt,
158157 _ => unreachable ! ( )
159158 } ;
160159
161- // Check uniqueness of errors and output metadata.
162- with_registered_diagnostics ( |diagnostics| {
163- match check_uniqueness ( crate_name, & * diagnostics) {
164- Ok ( Duplicate ( err, location) ) => {
165- ecx. span_err ( span, & format ! (
166- "error {} from `{}' also found in `{}'" ,
167- err, crate_name, location
168- ) ) ;
169- } ,
170- Ok ( _) => ( ) ,
171- Err ( e) => panic ! ( "{}" , e. description( ) )
172- }
173-
174- output_metadata ( & * ecx, crate_name, & * diagnostics) . ok ( ) . expect ( "metadata output error" ) ;
175- } ) ;
160+ // FIXME (#25705): we used to ensure error code uniqueness and
161+ // output error description JSON metadata here, but the approach
162+ // employed was too brittle.
176163
177164 // Construct the output expression.
178165 let ( count, expr) =
0 commit comments