-
Notifications
You must be signed in to change notification settings - Fork 12.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #14647 : BurntSushi/rust/fix-14185, r=alexcrichton
This fix suppresses dead_code warnings from code generated by regex! when the result of regex! is unused. Correct behavior should be a single unused variable warning. Regression tests are included for both `let` and `static` bound regex! values. see #14185
- Loading branch information
Showing
3 changed files
with
69 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
src/test/compile-fail-fulldeps/syntax-extension-regex-unused-static.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <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. | ||
|
||
// FIXME(#13725) windows needs fixing. | ||
// ignore-win32 | ||
// ignore-stage1 | ||
|
||
#![feature(phase)] | ||
|
||
extern crate regex; | ||
#[phase(syntax)] extern crate regex_macros; | ||
|
||
#[deny(unused_variable)] | ||
#[deny(dead_code)] | ||
|
||
// Tests to make sure that extraneous dead code warnings aren't emitted from | ||
// the code generated by regex!. | ||
// | ||
// The warning used for `static` items seems to be dead_code, which is why this | ||
// is a distinct test from using a normal let binding (which generates an | ||
// unused variable warning). | ||
|
||
fn main() { | ||
static fubar: regex::Regex = regex!("abc"); //~ ERROR code is never used: `fubar` | ||
} |
28 changes: 28 additions & 0 deletions
28
src/test/compile-fail-fulldeps/syntax-extension-regex-unused.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <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. | ||
|
||
// FIXME(#13725) windows needs fixing. | ||
// ignore-win32 | ||
// ignore-stage1 | ||
|
||
#![feature(phase)] | ||
|
||
extern crate regex; | ||
#[phase(syntax)] extern crate regex_macros; | ||
|
||
#[deny(unused_variable)] | ||
#[deny(dead_code)] | ||
|
||
// Tests to make sure that extraneous dead code warnings aren't emitted from | ||
// the code generated by regex!. | ||
|
||
fn main() { | ||
let fubar = regex!("abc"); //~ ERROR unused variable: `fubar` | ||
} |