user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support deprecated lints in find_lints

Browse source
This commit is contained in:
varkor 2018-09-15 17:05:52 +01:00
parent 5384f0fd3e
commit 52c0f13ff1
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc/lint/context.rs
View file

@ -297,7 +297,7 @@ impl LintStore {
self.by_name.insert(name.into(), Removed(reason.into()));
}
pub fn find_lints(&self, lint_name: &str) -> Result<Vec<LintId>, FindLintError> {
pub fn find_lints(&self, mut lint_name: &str) -> Result<Vec<LintId>, FindLintError> {
match self.by_name.get(lint_name) {
Some(&Id(lint_id)) => Ok(vec![lint_id]),
Some(&Renamed(_, lint_id)) => {
@ -307,9 +307,17 @@ impl LintStore {
Err(FindLintError::Removed)
},
None => {
match self.lint_groups.get(lint_name) {
Some(v) => Ok(v.0.clone()),
None => Err(FindLintError::Removed)
loop {
return match self.lint_groups.get(lint_name) {
Some((ids, _, depr)) => {
if let Some((name, _)) = depr {
lint_name = name;
continue;
}
Ok(ids.clone())
}
None => Err(FindLintError::Removed)
};
}
}
}