Fix compilation errors after rebase

FabianWolff · FabianWolff · commit 88ff8f82a53e · 2021-06-15T15:03:10.000+02:00
diff --git a/compiler/rustc_lint/src/levels.rs b/compiler/rustc_lint/src/levels.rs
@@ -88,7 +88,7 @@ impl<'s> LintLevelsBuilder<'s> {
         self.sets.lint_cap = sess.opts.lint_cap.unwrap_or(Level::Forbid);
 
         for (position, &(ref lint_name, level)) in (0u32..).zip(sess.opts.lint_opts.iter()) {
-            store.check_lint_name_cmdline(sess, &lint_name, level);
+            store.check_lint_name_cmdline(sess, &lint_name, Some(level));
             let orig_level = level;
 
             // If the cap is less than this specified level, e.g., if we've got
@@ -129,8 +129,6 @@ impl<'s> LintLevelsBuilder<'s> {
                 self.sets.force_warns.extend(&lints);
             }
         }
-
-        self.sets.list.push(LintSet::CommandLine { specs });
     }
 
     fn get_current_depth(&self) -> u32 {

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ impl<'s> LintLevelsBuilder<'s> {`
`88`	`88`	`self.sets.lint_cap = sess.opts.lint_cap.unwrap_or(Level::Forbid);`
`89`	`89`
`90`	`90`	`for (position, &(ref lint_name, level)) in (0u32..).zip(sess.opts.lint_opts.iter()) {`
`91`		`- store.check_lint_name_cmdline(sess, &lint_name, level);`
	`91`	`+ store.check_lint_name_cmdline(sess, &lint_name, Some(level));`
`92`	`92`	`let orig_level = level;`
`93`	`93`
`94`	`94`	`// If the cap is less than this specified level, e.g., if we've got`
`@@ -129,8 +129,6 @@ impl<'s> LintLevelsBuilder<'s> {`
`129`	`129`	`self.sets.force_warns.extend(&lints);`
`130`	`130`	`}`
`131`	`131`	`}`
`132`		`-`
`133`		`- self.sets.list.push(LintSet::CommandLine { specs });`
`134`	`132`	`}`
`135`	`133`
`136`	`134`	`fn get_current_depth(&self) -> u32 {`