about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-03-12 16:50:00 +0000
committerbors <bors@rust-lang.org>2017-03-12 16:50:00 +0000
commit0066869dc09d9c63c5d90bb55884f0150f84c3af (patch)
tree21d385ffc06a157ebae9d19c8521eefa6901a8c3 /src/libsyntax_ext
parentf88b24b34c6d17ebe4014bec5a0f7c2a57c529c7 (diff)
parent3b002a8ab5322f6503ccc3d13d3ae40ae0f54c5c (diff)
downloadrust-0066869dc09d9c63c5d90bb55884f0150f84c3af.tar.gz
rust-0066869dc09d9c63c5d90bb55884f0150f84c3af.zip
Auto merge of #40455 - frewsxcv:rollup, r=frewsxcv
Rollup of 5 pull requests

- Successful merges: #40369, #40390, #40426, #40449, #40453
- Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/concat_idents.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/concat_idents.rs b/src/libsyntax_ext/concat_idents.rs
index 1fc1bdff593..dc4b8eb24cd 100644
--- a/src/libsyntax_ext/concat_idents.rs
+++ b/src/libsyntax_ext/concat_idents.rs
@@ -61,7 +61,7 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt,
         fn path(&self) -> ast::Path {
             ast::Path {
                 span: self.span,
-                segments: vec![self.ident.into()],
+                segments: vec![ast::PathSegment::from_ident(self.ident, self.span)],
             }
         }
     }