Auto merge of #21769 - brooksbp:column-line-macro, r=nick29581

Please see discussion in #19284 .

diff --cc src/librustc_trans/trans/common.rs
Simple merge

diff --cc src/librustc_trans/trans/controlflow.rs
index 6860cda8241c9011489874b7cae1094a4b27355b,631aa324f6ce28c9c1c34b9f279b6ba6598adb17..5eebe6a4a05fb5e98ca06b3b15793b5692923924
--- 1/src/librustc_trans/trans/controlflow.rs
--- 2/src/librustc_trans/trans/controlflow.rs
+++ b/src/librustc_trans/trans/controlflow.rs
@@@ -375,9 -368,9 +375,9 @@@ pub fn trans_fail<'blk, 'tcx>(bcx: Bloc
  
      let v_str = C_str_slice(ccx, fail_str);
      let loc = bcx.sess().codemap().lookup_char_pos(call_info.span.lo);
 -    let filename = token::intern_and_get_ident(&loc.file.name[]);
 +    let filename = token::intern_and_get_ident(&loc.file.name);
      let filename = C_str_slice(ccx, filename);
-     let line = C_uint(ccx, loc.line);
+     let line = C_u32(ccx, loc.line as u32);
      let expr_file_line_const = C_struct(ccx, &[v_str, filename, line], false);
      let expr_file_line = consts::addr_of(ccx, expr_file_line_const,
                                           "panic_loc", call_info.id);

diff --cc src/libsyntax/ext/build.rs
Simple merge

diff --cc src/libsyntax/ext/source_util.rs
Simple merge