diff options
| author | bors <bors@rust-lang.org> | 2015-02-23 01:53:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-02-23 01:53:38 +0000 |
| commit | f0f7ca27de6b4e03f30012656dad270cda55a363 (patch) | |
| tree | 862b2d4252579c51278661075d8d0cf1f4149dcd /src/libsyntax/ext/source_util.rs | |
| parent | 67eb38ee4cfd7b28f8498b5b6492da172768dcb9 (diff) | |
| parent | fc9fa1a563c48cc928c8c5754597ffba6f53a635 (diff) | |
| download | rust-f0f7ca27de6b4e03f30012656dad270cda55a363.tar.gz rust-f0f7ca27de6b4e03f30012656dad270cda55a363.zip | |
Auto merge of #21769 - brooksbp:column-line-macro, r=nick29581
Please see discussion in #19284 .
Diffstat (limited to 'src/libsyntax/ext/source_util.rs')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index ac82effeaea..af43f5a1501 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -35,7 +35,7 @@ pub fn expand_line(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let topmost = cx.original_span_in_file(); let loc = cx.codemap().lookup_char_pos(topmost.lo); - base::MacExpr::new(cx.expr_usize(topmost, loc.line)) + base::MacExpr::new(cx.expr_u32(topmost, loc.line as u32)) } /* column!(): expands to the current column number */ @@ -45,7 +45,8 @@ pub fn expand_column(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let topmost = cx.original_span_in_file(); let loc = cx.codemap().lookup_char_pos(topmost.lo); - base::MacExpr::new(cx.expr_usize(topmost, loc.col.to_usize())) + + base::MacExpr::new(cx.expr_u32(topmost, loc.col.to_usize() as u32)) } /// file!(): expands to the current filename */ |