about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-01-29 11:28:30 +0000
committerbors <bors@rust-lang.org>2015-01-29 11:28:30 +0000
commit3d6f5100aff24aa97275dc92ade728caac605560 (patch)
tree46d24003505b7ac308de9b4d4130b73825379b64 /src/libsyntax/parse
parentbedd8108dc9b79402d1ea5349d766275f73398ff (diff)
parent092330c6405c275f89fbbbb412e932dd7ed8513d (diff)
downloadrust-3d6f5100aff24aa97275dc92ade728caac605560.tar.gz
rust-3d6f5100aff24aa97275dc92ade728caac605560.zip
Auto merge of #21730 - Manishearth:rollup, r=alexcrichton
Should clear our backlog of rollups from the queue
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 4bd476885a0..0be7b605e57 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -854,7 +854,7 @@ mod test {
     #[test]
     fn string_to_tts_1 () {
         let tts = string_to_tts("fn a (b : i32) { b; }".to_string());
-        assert_eq!(json::encode(&tts),
+        assert_eq!(json::encode(&tts).unwrap(),
         "[\
     {\
         \"variant\":\"TtToken\",\