Skip to content

Commit ef439dd

Browse files
committed
auto merge of #16450 : klutzy/rust/win-fixme-cleanup, r=alexcrichton
First commit enables regex test on Windows. It was not working at some point (#13725), but it works now. Second commit removes various FIXMEs regarding #13793, since upstream bug has been fixed.
2 parents 1824973 + 4806746 commit ef439dd

File tree

8 files changed

+1
-18
lines changed

8 files changed

+1
-18
lines changed

Diff for: src/libregex/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,7 @@ mod parse;
395395
mod re;
396396
mod vm;
397397

398-
// FIXME(#13725) windows needs fixing.
399-
#[cfg(test, not(windows))]
398+
#[cfg(test)]
400399
mod test;
401400

402401
/// The `native` module exists to support the `regex!` macro. Do not use.

Diff for: src/test/bench/shootout-regex-dna.rs

-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
3939
// OF THE POSSIBILITY OF SUCH DAMAGE.
4040

41-
// FIXME(#13725) windows needs fixing.
42-
// ignore-windows
4341
// ignore-stage1
4442
// ignore-cross-compile #12102
4543

Diff for: src/test/compile-fail-fulldeps/syntax-extension-regex-invalid.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// FIXME(#13725) windows needs fixing.
12-
// ignore-windows
1311
// ignore-stage1
1412

1513
#![feature(phase)]

Diff for: src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// FIXME(#13725) windows needs fixing.
12-
// ignore-windows
1311
// ignore-stage1
1412

1513
#![feature(phase)]

Diff for: src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// FIXME(#13725) windows needs fixing.
12-
// ignore-windows
1311
// ignore-stage1
1412

1513
#![feature(phase)]

Diff for: src/test/run-make/no-intermediate-extras/foo.rs

-5
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,3 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
11-
// FIXME #13793
12-
#[test]
13-
fn test_dummy() {
14-
}

Diff for: src/test/run-pass/issue-14393.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-windows: FIXME #13793
12-
1311
fn main() {
1412
match ("", 1u) {
1513
(_, 42u) => (),

Diff for: src/test/run-pass/test-runner-hides-main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
// compile-flags:--test
12-
// ignore-windows #10872
1312
// ignore-pretty: does not work well with `--test`
1413

1514
// Building as a test runner means that a synthetic main will be run,

0 commit comments

Comments
 (0)