about summary refs log tree commit diff
path: root/src/libregex
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-22 07:16:17 +0000
committerbors <bors@rust-lang.org>2014-07-22 07:16:17 +0000
commit8d43e4474aba98d99e2778dcdcd5b0515b7b8176 (patch)
tree6fb6f271ba16b79fdd6b1edd30bed9a88664f10b /src/libregex
parent32f4d996ea2bea69fe363dca4e6e09b91bbd83f3 (diff)
parent95a1ce6f3f3a31d4e64b04637cd252cc02b623dd (diff)
downloadrust-8d43e4474aba98d99e2778dcdcd5b0515b7b8176.tar.gz
rust-8d43e4474aba98d99e2778dcdcd5b0515b7b8176.zip
auto merge of #15867 : cmr/rust/rewrite-lexer4, r=alexcrichton
Diffstat (limited to 'src/libregex')
-rw-r--r--src/libregex/lib.rs2
-rw-r--r--src/libregex/test/tests.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs
index 1bb7f605e54..fae3e598680 100644
--- a/src/libregex/lib.rs
+++ b/src/libregex/lib.rs
@@ -7,6 +7,8 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
+//
+// ignore-lexer-test FIXME #15679
 
 //! This crate provides a native implementation of regular expressions that is
 //! heavily based on RE2 both in syntax and in implementation. Notably,
diff --git a/src/libregex/test/tests.rs b/src/libregex/test/tests.rs
index 251ab10ad34..48065992bb0 100644
--- a/src/libregex/test/tests.rs
+++ b/src/libregex/test/tests.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
+// ignore-lexer-test FIXME #15679
 
 use regex::{Regex, NoExpand};