Commit 2589fe0

committed

Emit the usages suggestions as multipart suggestions

1 parent 6fcb3f3 commit 2589fe0Copy full SHA for 2589fe0

File tree

+33

-19

lines changed

+33

-19

lines changed

Lines changed: 18 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ pub(crate) struct NonUpperCaseGlobal<'a> {`
`1349`	`1349`	`#[subdiagnostic]`
`1350`	`1350`	`pub sub: NonUpperCaseGlobalSub,`
`1351`	`1351`	`#[subdiagnostic]`
`1352`		`- pub usages: Vec<NonUpperCaseGlobalSub>,`
	`1352`	`+ pub usages: Option<NonUpperCaseGlobalSubUsages>,`
`1353`	`1353`	`}`
`1354`	`1354`
`1355`	`1355`	`#[derive(Subdiagnostic)]`
`@@ -1367,6 +1367,23 @@ pub(crate) enum NonUpperCaseGlobalSub {`
`1367`	`1367`	`},`
`1368`	`1368`	`}`
`1369`	`1369`
	`1370`	`+pub(crate) struct NonUpperCaseGlobalSubUsages {`
	`1371`	`+ pub(crate) spans: Vec<Span>,`
	`1372`	`+ pub(crate) replace: String,`
	`1373`	`+}`
	`1374`	`+`
	`1375`	`+impl Subdiagnostic for NonUpperCaseGlobalSubUsages {`
	`1376`	`+ fn add_to_diag<G: EmissionGuarantee>(self, diag: &mut Diag<'_, G>) {`
	`1377`	`+ if !self.spans.is_empty() {`
	`1378`	`+ diag.multipart_suggestion_verbose(`
	`1379`	`+ crate::fluent_generated::_subdiag::suggestion,`
	`1380`	`+ self.spans.into_iter().map(\|sp\| (sp, self.replace.clone())).collect(),`
	`1381`	`+ Applicability::MaybeIncorrect,`
	`1382`	`+ );`
	`1383`	`+ }`
	`1384`	`+ }`
	`1385`	`+}`
	`1386`	`+`
`1370`	`1387`	`// noop_method_call.rs`
`1371`	`1388`	`#[derive(LintDiagnostic)]`
`1372`	`1389`	`#[diag(lint_noop_method_call)]`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ use {rustc_ast as ast, rustc_hir as hir};`
`14`	`14`
`15`	`15`	`use crate::lints::{`
`16`	`16`	`NonCamelCaseType, NonCamelCaseTypeSub, NonSnakeCaseDiag, NonSnakeCaseDiagSub,`
`17`		`- NonUpperCaseGlobal, NonUpperCaseGlobalSub,`
	`17`	`+ NonUpperCaseGlobal, NonUpperCaseGlobalSub,NonUpperCaseGlobalSubUsages,`
`18`	`18`	`};`
`19`	`19`	`use crate::{EarlyContext, EarlyLintPass, LateContext, LateLintPass, LintContext};`
`20`	`20`
`@@ -534,9 +534,12 @@ impl NonUpperCaseGlobals {`
`534`	`534`	`let usages = if let Some(did) = did {`
`535`	`535`	`let mut usage_collector = UsageCollector { cx, did, collected: Vec::new() };`
`536`	`536`	`cx.tcx.hir_walk_toplevel_module(&mut usage_collector);`
`537`		`- usage_collector.collected.into_iter().map(\|span\| sub(span)).collect()`
	`537`	`+ Some(NonUpperCaseGlobalSubUsages {`
	`538`	`+ spans: usage_collector.collected,`
	`539`	`+ replace: uc.clone(),`
	`540`	`+ })`
`538`	`541`	`} else {`
`539`		`- vec![]`
	`542`	`+ None`
`540`	`543`	`};`
`541`	`544`
`542`	`545`	`cx.emit_span_lint(`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//`
	`1`	+// Checks that the `non_upper_case_globals` emits suggestions for usages as well
`2`	`2`	`// <https://github.com/rust-lang/rust/issues/124061>`
`3`	`3`
`4`	`4`	`//@ check-pass`

Lines changed: 8 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,11 @@ LL + const MY_STATIC: u32 = 0;`
`12`	`12`	`\|`
`13`	`13`	`help: convert the identifier to upper case`
`14`	`14`	`\|`
`15`		`-LL - const LOL: u32 = my_static + 0;`
`16`		`-LL + const LOL: u32 = MY_STATIC + 0;`
`17`		`- \|`
`18`		`-help: convert the identifier to upper case`
`19`		`- \|`
`20`		`-LL - let _a = crate::my_static;`
`21`		`-LL + let _a = crate::MY_STATIC;`
	`15`	`+LL ~ const LOL: u32 = MY_STATIC + 0;`
	`16`	`+LL \|`
	`17`	`+...`
	`18`	`+LL \| fn main() {`
	`19`	`+LL ~ let _a = crate::MY_STATIC;`
`22`	`20`	`\|`
`23`	`21`
`24`	`22`	warning: constant `fooFOO` should have an upper case name
`@@ -34,13 +32,9 @@ LL + static FOO_FOO: Cell<usize> = unreachable!();`
`34`	`32`	`\|`
`35`	`33`	`help: convert the identifier to upper case`
`36`	`34`	`\|`
`37`		`-LL - fooFOO.set(9);`
`38`		`-LL + FOO_FOO.set(9);`
`39`		`- \|`
`40`		`-help: convert the identifier to upper case`
`41`		`- \|`
`42`		`-LL - println!("{}", fooFOO.get());`
`43`		`-LL + println!("{}", FOO_FOO.get());`
	`35`	`+LL ~ FOO_FOO.set(9);`
	`36`	`+LL \|`
	`37`	`+LL ~ println!("{}", FOO_FOO.get());`
`44`	`38`	`\|`
`45`	`39`
`46`	`40`	warning: const parameter `foo` should have an upper case name

Comments

(0)