From 54da7c0a2f6d26fe1d155e380ecf572d2d3187ac Mon Sep 17 00:00:00 2001 From: qstommyshu Date: Fri, 21 Mar 2025 07:32:11 -0400 Subject: [PATCH 1/2] Add witness hint for `module_missing` lint and update snapshot --- src/lints/module_missing.ron | 3 +++ test_outputs/witnesses/module_missing.snap | 24 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 test_outputs/witnesses/module_missing.snap diff --git a/src/lints/module_missing.ron b/src/lints/module_missing.ron index eb86ec8e..5234d019 100644 --- a/src/lints/module_missing.ron +++ b/src/lints/module_missing.ron @@ -47,4 +47,7 @@ SemverQuery( }, error_message: "A publicly-visible module cannot be imported by its prior path. A `pub use` may have been removed, or the module may have been renamed, removed, or made non-public.", per_result_error_template: Some("mod {{join \"::\" path}}, previously in file {{span_filename}}:{{span_begin_line}}"), + witness: ( + hint_template: r#"use {{join "::" path}};"#, + ), ) diff --git a/test_outputs/witnesses/module_missing.snap b/test_outputs/witnesses/module_missing.snap new file mode 100644 index 00000000..ce88fe06 --- /dev/null +++ b/test_outputs/witnesses/module_missing.snap @@ -0,0 +1,24 @@ +--- +source: src/query.rs +description: "Lint `module_missing` did not have the expected witness output.\nSee https://github.com/obi1kenobi/cargo-semver-checks/blob/main/CONTRIBUTING.md#testing-witnesses\nfor more information." +expression: "&actual_witnesses" +--- +[["./test_crates/module_missing/"]] +filename = 'src/lib.rs' +begin_line = 10 +hint = 'use module_missing::bb::will_remove;' + +[["./test_crates/module_missing/"]] +filename = 'src/lib.rs' +begin_line = 13 +hint = 'use module_missing::will_make_private;' + +[["./test_crates/trait_missing/"]] +filename = 'src/lib.rs' +begin_line = 7 +hint = 'use trait_missing::my_pub_mod;' + +[["./test_crates/trait_missing_with_major_bump/"]] +filename = 'src/lib.rs' +begin_line = 7 +hint = 'use trait_missing_with_major_bump::my_pub_mod;' From 325ae64590eb6f865007069cde974199846bb286 Mon Sep 17 00:00:00 2001 From: qstommyshu Date: Tue, 25 Mar 2025 08:01:42 -0400 Subject: [PATCH 2/2] include wildcard * in module import --- src/lints/module_missing.ron | 2 +- test_outputs/witnesses/module_missing.snap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lints/module_missing.ron b/src/lints/module_missing.ron index 5234d019..776511f1 100644 --- a/src/lints/module_missing.ron +++ b/src/lints/module_missing.ron @@ -48,6 +48,6 @@ SemverQuery( error_message: "A publicly-visible module cannot be imported by its prior path. A `pub use` may have been removed, or the module may have been renamed, removed, or made non-public.", per_result_error_template: Some("mod {{join \"::\" path}}, previously in file {{span_filename}}:{{span_begin_line}}"), witness: ( - hint_template: r#"use {{join "::" path}};"#, + hint_template: r#"use {{join "::" path}}::*;"#, ), ) diff --git a/test_outputs/witnesses/module_missing.snap b/test_outputs/witnesses/module_missing.snap index ce88fe06..4fefcf2e 100644 --- a/test_outputs/witnesses/module_missing.snap +++ b/test_outputs/witnesses/module_missing.snap @@ -6,19 +6,19 @@ expression: "&actual_witnesses" [["./test_crates/module_missing/"]] filename = 'src/lib.rs' begin_line = 10 -hint = 'use module_missing::bb::will_remove;' +hint = 'use module_missing::bb::will_remove::*;' [["./test_crates/module_missing/"]] filename = 'src/lib.rs' begin_line = 13 -hint = 'use module_missing::will_make_private;' +hint = 'use module_missing::will_make_private::*;' [["./test_crates/trait_missing/"]] filename = 'src/lib.rs' begin_line = 7 -hint = 'use trait_missing::my_pub_mod;' +hint = 'use trait_missing::my_pub_mod::*;' [["./test_crates/trait_missing_with_major_bump/"]] filename = 'src/lib.rs' begin_line = 7 -hint = 'use trait_missing_with_major_bump::my_pub_mod;' +hint = 'use trait_missing_with_major_bump::my_pub_mod::*;'