Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
a6401b5
commit 0f73bf3
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` | ||
} |
0f73bf3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from alexcrichton
at BurntSushi@0f73bf3
0f73bf3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging BurntSushi/rust/fix-14185 = 0f73bf3 into auto
0f73bf3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
BurntSushi/rust/fix-14185 = 0f73bf3 merged ok, testing candidate = 3ec321f
0f73bf3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/6078
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/6076
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/5172
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/5181
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/6176
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/5264
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/5272
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/6178
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/5263
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/5269
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/5329
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/3065
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/6168
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/5264
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/5279
0f73bf3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 3ec321f