mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #66419 - JohnTitor:ignore-underscore, r=varkor

Browse Source 
Don't warn labels beginning with `_` on unused_labels lint

Fixes #66382

r? @varkor
This commit is contained in:
Yuki Okushi 2019-11-15 18:36:34 +09:00 committed by GitHub
commit 26eb9093fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc_resolve/late.rs
View File

@ -1767,7 +1767,9 @@ impl<'a, 'b> LateResolutionVisitor<'a, '_> {
fn with_resolved_label(&mut self, label: Option<Label>, id: NodeId, f: impl FnOnce(&mut Self)) {
if let Some(label) = label {
self.diagnostic_metadata.unused_labels.insert(id, label.ident.span);
if label.ident.as_str().as_bytes()[1] != b'_' {
self.diagnostic_metadata.unused_labels.insert(id, label.ident.span);
}
self.with_label_rib(NormalRibKind, |this| {
let ident = label.ident.modern_and_legacy();
this.label_ribs.last_mut().unwrap().bindings.insert(ident, id);

10
src/test/ui/label/label-beginning-with-underscore.rs Normal file
View File

@ -0,0 +1,10 @@
// check-pass
#![deny(unused_labels)]
fn main() {
// `unused_label` shouldn't warn labels beginning with `_`
'_unused: loop {
break;
}
}