Skip to content

Commit 4f0fac1

Browse files
committed
---
yaml --- r: 157235 b: refs/heads/master c: 1ad1e2e h: refs/heads/master i: 157233: 54437b7 157231: 2cbebbf v: v3
1 parent eebe0b4 commit 4f0fac1

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: e0ad0fcb95f0bd6e69e9032c23b66515a590dfe5
2+
refs/heads/master: 1ad1e2e2992d37c27f264366487ee813e9440d7f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: d44ea720fa9dfe062ef06d0eb49a58d4e7e92344
55
refs/heads/try: 6ecdf1fa83d7cdbf44a0091132e9c6580be72275

trunk/src/librustc/lint/context.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,12 @@ impl LintStore {
261261
match self.by_name.find_equiv(&lint_name) {
262262
Some(&Id(lint_id)) => Some(lint_id),
263263
Some(&Renamed(ref new_name, lint_id)) => {
264-
// NOTE(stage0): add the following code after the next snapshot
265-
266-
// let warning = format!("lint {} has been renamed to {}",
267-
// lint_name, new_name);
268-
// match span {
269-
// Some(span) => sess.span_warn(span, warning.as_slice()),
270-
// None => sess.warn(warning.as_slice()),
271-
// };
264+
let warning = format!("lint {} has been renamed to {}",
265+
lint_name, new_name);
266+
match span {
267+
Some(span) => sess.span_warn(span, warning.as_slice()),
268+
None => sess.warn(warning.as_slice()),
269+
};
272270
Some(lint_id)
273271
}
274272
None => None

0 commit comments

Comments
 (0)