about summary refs log tree commit diff
path: root/src/libsyntax_ext
diff options
context:
space:
mode:
authorMichael Lamparski <diagonaldevice@gmail.com>2018-02-07 09:32:26 -0500
committerMichael Lamparski <diagonaldevice@gmail.com>2018-02-07 12:48:21 -0500
commit1137fb193583971f35e1d4b3cfcb25725948da4f (patch)
tree9cdab0fc2cd3facbad058dddd2125e323ba8dff3 /src/libsyntax_ext
parent96eed862a08f0ee1d234f4f83419dd46fe58ccef (diff)
downloadrust-1137fb193583971f35e1d4b3cfcb25725948da4f.tar.gz
rust-1137fb193583971f35e1d4b3cfcb25725948da4f.zip
libsyntax/ext: trailing commas in builtin macros
Most notably this changes 'syntax::ext::base::get_single_str_from_tts'
to accept a trailing comma, and revises the documentation so that this
aspect is not surprising. I made this change under the understanding
that this crate is private rustc implementation detail (I hope this is
correct!). After reviewing all call sites, I believe the revised
semantics are closer to the intended spirit of the function.
Diffstat (limited to 'src/libsyntax_ext')
-rw-r--r--src/libsyntax_ext/cfg.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax_ext/cfg.rs b/src/libsyntax_ext/cfg.rs
index 1d8dc406468..1eeba9b30b8 100644
--- a/src/libsyntax_ext/cfg.rs
+++ b/src/libsyntax_ext/cfg.rs
@@ -28,6 +28,8 @@ pub fn expand_cfg<'cx>(cx: &mut ExtCtxt,
     let mut p = cx.new_parser_from_tts(tts);
     let cfg = panictry!(p.parse_meta_item());
 
+    let _ = p.eat(&token::Comma);
+
     if !p.eat(&token::Eof) {
         cx.span_err(sp, "expected 1 cfg-pattern");
         return DummyResult::expr(sp);