diff options
| author | bors <bors@rust-lang.org> | 2014-03-22 09:51:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-22 09:51:49 -0700 |
| commit | 403e8695712cd9779b9cc91c61e780d3bfb8212a (patch) | |
| tree | 9be221d4577fa3a4960e8c653c0a4612ee298f72 /src/libsyntax/ext/source_util.rs | |
| parent | 5e8e1b515a9ef1cd38ee0c71f032415906a7f42d (diff) | |
| parent | 9dc357b8ed0ebc0755f7247deb8314c74e1acf80 (diff) | |
| download | rust-403e8695712cd9779b9cc91c61e780d3bfb8212a.tar.gz rust-403e8695712cd9779b9cc91c61e780d3bfb8212a.zip | |
auto merge of #13053 : alexcrichton/rust/removing-ref-cell-get, r=huonw
This commit removes the `get()` method from `Ref` and `RefMut` in favor of the `*` operator, and removes all usage of the `deref()` function manually from rustc, favoring using `*` instead. Some of the code is a little wacky, but that's due to either #13044 or #13042
Diffstat (limited to 'src/libsyntax/ext/source_util.rs')
| -rw-r--r-- | src/libsyntax/ext/source_util.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index 137cd89bf30..8931fb0f443 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_util.rs @@ -57,7 +57,7 @@ pub fn expand_file(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) let topmost = topmost_expn_info(cx.backtrace().unwrap()); let loc = cx.codemap().lookup_char_pos(topmost.call_site.lo); - let filename = token::intern_and_get_ident(loc.file.deref().name); + let filename = token::intern_and_get_ident(loc.file.name); base::MRExpr(cx.expr_str(topmost.call_site, filename)) } |