Auto merge of #12669 - weihanglo:lint-refactor, r=epage

bors · bors · commit 64642cc9f4db · 2023-09-14T16:41:27.000Z
refactor: fix lint errors in preparation of `[lints]` table integration
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/clippy.toml b/clippy.toml
@@ -1,8 +1,8 @@
 allow-print-in-tests = true
 allow-dbg-in-tests = true
 disallowed-methods = [
-    { path = "std::env::var", reason = "Use `Config::get_env` instead. See rust-lang/cargo#11588" },
-    { path = "std::env::var_os", reason = "Use `Config::get_env_os` instead. See rust-lang/cargo#11588" },
-    { path = "std::env::vars", reason = "Not recommended to use in Cargo. See rust-lang/cargo#11588" },
-    { path = "std::env::vars_os", reason = "Not recommended to use in Cargo. See rust-lang/cargo#11588" },
+    { path = "std::env::var", reason = "use `Config::get_env` instead. See rust-lang/cargo#11588" },
+    { path = "std::env::var_os", reason = "use `Config::get_env_os` instead. See rust-lang/cargo#11588" },
+    { path = "std::env::vars", reason = "not recommended to use in Cargo. See rust-lang/cargo#11588" },
+    { path = "std::env::vars_os", reason = "not recommended to use in Cargo. See rust-lang/cargo#11588" },
 ]
diff --git a/crates/cargo-platform/src/error.rs b/crates/cargo-platform/src/error.rs
@@ -21,7 +21,7 @@ pub enum ParseErrorKind {
 }
 
 impl fmt::Display for ParseError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
             "failed to parse `{}` as a cfg expression: {}",
@@ -31,7 +31,7 @@ impl fmt::Display for ParseError {
 }
 
 impl fmt::Display for ParseErrorKind {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         use ParseErrorKind::*;
         match self {
             UnterminatedString => write!(f, "unterminated string in cfg"),
diff --git a/crates/cargo-test-macro/src/lib.rs b/crates/cargo-test-macro/src/lib.rs
@@ -1,5 +1,3 @@
-extern crate proc_macro;
-
 use proc_macro::*;
 use std::process::Command;
 use std::sync::Once;
diff --git a/crates/cargo-test-support/src/registry.rs b/crates/cargo-test-support/src/registry.rs
@@ -790,7 +790,7 @@ impl HttpServer {
         }
     }
 
-    fn check_authorized(&self, req: &Request, mutation: Option<Mutation>) -> bool {
+    fn check_authorized(&self, req: &Request, mutation: Option<Mutation<'_>>) -> bool {
         let (private_key, private_key_subject) = if mutation.is_some() || self.auth_required {
             match &self.token {
                 Token::Plaintext(token) => return Some(token) == req.authorization.as_ref(),
@@ -832,7 +832,8 @@ impl HttpServer {
             url: &'a str,
             kip: &'a str,
         }
-        let footer: Footer = t!(serde_json::from_slice(untrusted_token.untrusted_footer()).ok());
+        let footer: Footer<'_> =
+            t!(serde_json::from_slice(untrusted_token.untrusted_footer()).ok());
         if footer.kip != paserk_pub_key_id {
             return false;
         }
@@ -846,7 +847,6 @@ impl HttpServer {
         if footer.url != "https://github.com/rust-lang/crates.io-index"
             && footer.url != &format!("sparse+http://{}/index/", self.addr.to_string())
         {
-            dbg!(footer.url);
             return false;
         }
 
@@ -862,20 +862,18 @@ impl HttpServer {
             _challenge: Option<&'a str>, // todo: PASETO with challenges
             v: Option<u8>,
         }
-        let message: Message = t!(serde_json::from_str(trusted_token.payload()).ok());
+        let message: Message<'_> = t!(serde_json::from_str(trusted_token.payload()).ok());
         let token_time = t!(OffsetDateTime::parse(message.iat, &Rfc3339).ok());
         let now = OffsetDateTime::now_utc();
         if (now - token_time) > Duration::MINUTE {
             return false;
         }
         if private_key_subject.as_deref() != message.sub {
-            dbg!(message.sub);
             return false;
         }
         // - If the claim v is set, that it has the value of 1.
         if let Some(v) = message.v {
             if v != 1 {
-                dbg!(message.v);
                 return false;
             }
         }
@@ -885,22 +883,18 @@ impl HttpServer {
         if let Some(mutation) = mutation {
             //  - That the operation matches the mutation field and is one of publish, yank, or unyank.
             if message.mutation != Some(mutation.mutation) {
-                dbg!(message.mutation);
                 return false;
             }
             //  - That the package, and version match the request.
             if message.name != mutation.name {
-                dbg!(message.name);
                 return false;
             }
             if message.vers != mutation.vers {
-                dbg!(message.vers);
                 return false;
             }
             //  - If the mutation is publish, that the version has not already been published, and that the hash matches the request.
             if mutation.mutation == "publish" {
                 if message.cksum != mutation.cksum {
-                    dbg!(message.cksum);
                     return false;
                 }
             }
diff --git a/crates/mdman/src/format/mod.rs b/crates/mdman/src/format/mod.rs
diff --git a/crates/mdman/src/hbs.rs b/crates/mdman/src/hbs.rs
@@ -12,7 +12,7 @@ use std::path::Path;
 type FormatterRef<'a> = &'a (dyn Formatter + Send + Sync);
 
 /// Processes the handlebars template at the given file.
-pub fn expand(file: &Path, formatter: FormatterRef) -> Result<String, Error> {
+pub fn expand(file: &Path, formatter: FormatterRef<'_>) -> Result<String, Error> {
     let mut handlebars = Handlebars::new();
     handlebars.set_strict_mode(true);
     handlebars.register_helper("lower", Box::new(lower));
@@ -174,10 +174,10 @@ impl HelperDef for ManLinkHelper<'_> {
 ///
 /// This sets a variable to a value within the template context.
 fn set_decorator(
-    d: &Decorator,
-    _: &Handlebars,
+    d: &Decorator<'_, '_>,
+    _: &Handlebars<'_>,
     _ctx: &Context,
-    rc: &mut RenderContext,
+    rc: &mut RenderContext<'_, '_>,
 ) -> Result<(), RenderError> {
     let data_to_set = d.hash();
     for (k, v) in data_to_set {
@@ -187,7 +187,7 @@ fn set_decorator(
 }
 
 /// Sets a variable to a value within the context.
-fn set_in_context(rc: &mut RenderContext, key: &str, value: serde_json::Value) {
+fn set_in_context(rc: &mut RenderContext<'_, '_>, key: &str, value: serde_json::Value) {
     let mut ctx = match rc.context() {
         Some(c) => (*c).clone(),
         None => Context::wraps(serde_json::Value::Object(serde_json::Map::new())).unwrap(),
@@ -201,7 +201,7 @@ fn set_in_context(rc: &mut RenderContext, key: &str, value: serde_json::Value) {
 }
 
 /// Removes a variable from the context.
-fn remove_from_context(rc: &mut RenderContext, key: &str) {
+fn remove_from_context(rc: &mut RenderContext<'_, '_>, key: &str) {
     let ctx = rc.context().expect("cannot remove from null context");
     let mut ctx = (*ctx).clone();
     if let serde_json::Value::Object(m) = ctx.data_mut() {
diff --git a/crates/mdman/src/lib.rs b/crates/mdman/src/lib.rs
@@ -64,7 +64,7 @@ pub fn convert(
 type EventIter<'a> = Box<dyn Iterator<Item = (Event<'a>, Range<usize>)> + 'a>;
 
 /// Creates a new markdown parser with the given input.
-pub(crate) fn md_parser(input: &str, url: Option<Url>) -> EventIter {
+pub(crate) fn md_parser(input: &str, url: Option<Url>) -> EventIter<'_> {
     let mut options = Options::empty();
     options.insert(Options::ENABLE_TABLES);
     options.insert(Options::ENABLE_FOOTNOTES);
diff --git a/crates/mdman/src/main.rs b/crates/mdman/src/main.rs
@@ -48,7 +48,7 @@ fn run() -> Result<(), Error> {
         if same_file::is_same_file(source, &out_path).unwrap_or(false) {
             bail!("cannot output to the same file as the source");
         }
-        println!("Converting {} -> {}", source.display(), out_path.display());
+        eprintln!("Converting {} -> {}", source.display(), out_path.display());
         let result = mdman::convert(&source, opts.format, opts.url.clone(), opts.man_map.clone())
             .with_context(|| format!("failed to translate {}", source.display()))?;
 
diff --git a/crates/resolver-tests/src/lib.rs b/crates/resolver-tests/src/lib.rs
@@ -163,7 +163,7 @@ pub fn resolve_with_config_raw(
             if std::thread::panicking() && self.list.len() != self.used.len() {
                 // we found a case that causes a panic and did not use all of the input.
                 // lets print the part of the input that was used for minimization.
-                println!(
+                eprintln!(
                     "{:?}",
                     PrettyPrintRegistry(
                         self.list
diff --git a/crates/semver-check/src/main.rs b/crates/semver-check/src/main.rs
@@ -20,7 +20,7 @@ use std::process::{Command, Output};
 
 fn main() {
     if let Err(e) = doit() {
-        println!("error: {}", e);
+        eprintln!("error: {}", e);
         std::process::exit(1);
     }
 }
@@ -103,7 +103,7 @@ fn doit() -> Result<(), Box<dyn Error>> {
             result
         };
         let expect_success = parts[0][0].contains("MINOR");
-        println!("Running test from line {}", block_start);
+        eprintln!("Running test from line {}", block_start);
 
         let result = run_test(
             join(parts[1]),
diff --git a/crates/xtask-bump-check/src/xtask.rs b/crates/xtask-bump-check/src/xtask.rs
@@ -105,7 +105,7 @@ fn config_configure(config: &mut Config, args: &ArgMatches) -> CliResult {
 /// Main entry of `xtask-bump-check`.
 ///
 /// Assumption: version number are incremental. We never have point release for old versions.
-fn bump_check(args: &clap::ArgMatches, config: &mut cargo::util::Config) -> CargoResult<()> {
+fn bump_check(args: &clap::ArgMatches, config: &cargo::util::Config) -> CargoResult<()> {
     let ws = args.workspace(config)?;
     let repo = git2::Repository::open(ws.root())?;
     let base_commit = get_base_commit(config, args, &repo)?;
@@ -184,7 +184,7 @@ fn bump_check(args: &clap::ArgMatches, config: &mut cargo::util::Config) -> Carg
 
     status("no version bump needed for member crates.")?;
 
-    return Ok(());
+    Ok(())
 }
 
 /// Returns the commit of upstream `master` branch if `base-rev` is missing.
@@ -256,7 +256,7 @@ fn get_referenced_commit<'a>(
     repo: &'a git2::Repository,
     base: &git2::Commit<'a>,
 ) -> CargoResult<Option<git2::Commit<'a>>> {
-    let [beta, stable] = beta_and_stable_branch(&repo)?;
+    let [beta, stable] = beta_and_stable_branch(repo)?;
     let rev_id = base.id();
     let stable_commit = stable.get().peel_to_commit()?;
     let beta_commit = beta.get().peel_to_commit()?;
diff --git a/credential/cargo-credential-1password/src/main.rs b/credential/cargo-credential-1password/src/main.rs
@@ -255,8 +255,8 @@ pub struct OnePasswordCredential {}
 impl Credential for OnePasswordCredential {
     fn perform(
         &self,
-        registry: &RegistryInfo,
-        action: &Action,
+        registry: &RegistryInfo<'_>,
+        action: &Action<'_>,
         args: &[&str],
     ) -> Result<CredentialResponse, Error> {
         let op = OnePasswordKeychain::new(args)?;
diff --git a/credential/cargo-credential-libsecret/Cargo.toml b/credential/cargo-credential-libsecret/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-libsecret"
-version = "0.3.1"
+version = "0.3.2"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/rust-lang/cargo"
diff --git a/credential/cargo-credential-libsecret/src/lib.rs b/credential/cargo-credential-libsecret/src/lib.rs
@@ -104,16 +104,16 @@ mod linux {
     impl Credential for LibSecretCredential {
         fn perform(
             &self,
-            registry: &RegistryInfo,
-            action: &Action,
+            registry: &RegistryInfo<'_>,
+            action: &Action<'_>,
             _args: &[&str],
         ) -> Result<CredentialResponse, Error> {
             // Dynamically load libsecret to avoid users needing to install
             // additional -dev packages when building this provider.
             let lib;
-            let secret_password_lookup_sync: Symbol<SecretPasswordLookupSync>;
-            let secret_password_store_sync: Symbol<SecretPasswordStoreSync>;
-            let secret_password_clear_sync: Symbol<SecretPasswordClearSync>;
+            let secret_password_lookup_sync: Symbol<'_, SecretPasswordLookupSync>;
+            let secret_password_store_sync: Symbol<'_, SecretPasswordStoreSync>;
+            let secret_password_clear_sync: Symbol<'_, SecretPasswordClearSync>;
             unsafe {
                 lib = Library::new("libsecret-1.so").context(
                     "failed to load libsecret: try installing the `libsecret` \
diff --git a/credential/cargo-credential-wincred/Cargo.toml b/credential/cargo-credential-wincred/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-credential-wincred"
-version = "0.3.0"
+version = "0.3.1"
 edition.workspace = true
 license.workspace = true
 repository = "https://github.com/rust-lang/cargo"
diff --git a/credential/cargo-credential-wincred/src/lib.rs b/credential/cargo-credential-wincred/src/lib.rs
@@ -38,8 +38,8 @@ mod win {
     impl Credential for WindowsCredential {
         fn perform(
             &self,
-            registry: &RegistryInfo,
-            action: &Action,
+            registry: &RegistryInfo<'_>,
+            action: &Action<'_>,
             _args: &[&str],
         ) -> Result<CredentialResponse, Error> {
             match action {
diff --git a/credential/cargo-credential/examples/file-provider.rs b/credential/cargo-credential/examples/file-provider.rs
@@ -12,8 +12,8 @@ struct FileCredential;
 impl Credential for FileCredential {
     fn perform(
         &self,
-        registry: &RegistryInfo,
-        action: &Action,
+        registry: &RegistryInfo<'_>,
+        action: &Action<'_>,
         _args: &[&str],
     ) -> Result<CredentialResponse, cargo_credential::Error> {
         if registry.index_url != "https://github.com/rust-lang/crates.io-index" {
diff --git a/credential/cargo-credential/examples/stdout-redirected.rs b/credential/cargo-credential/examples/stdout-redirected.rs
@@ -7,8 +7,8 @@ struct MyCredential;
 impl Credential for MyCredential {
     fn perform(
         &self,
-        _registry: &RegistryInfo,
-        _action: &Action,
+        _registry: &RegistryInfo<'_>,
+        _action: &Action<'_>,
         _args: &[&str],
     ) -> Result<CredentialResponse, Error> {
         // Informational messages should be sent on stderr.
diff --git a/credential/cargo-credential/src/lib.rs b/credential/cargo-credential/src/lib.rs
@@ -61,8 +61,8 @@ pub struct UnsupportedCredential;
 impl Credential for UnsupportedCredential {
     fn perform(
         &self,
-        _registry: &RegistryInfo,
-        _action: &Action,
+        _registry: &RegistryInfo<'_>,
+        _action: &Action<'_>,
         _args: &[&str],
     ) -> Result<CredentialResponse, Error> {
         Err(Error::UrlNotSupported)
@@ -215,8 +215,8 @@ pub trait Credential {
     /// Retrieves a token for the given registry.
     fn perform(
         &self,
-        registry: &RegistryInfo,
-        action: &Action,
+        registry: &RegistryInfo<'_>,
+        action: &Action<'_>,
         args: &[&str],
     ) -> Result<CredentialResponse, Error>;
 }
@@ -260,7 +260,7 @@ fn doit(
 fn deserialize_request(
     value: &str,
 ) -> Result<CredentialRequest<'_>, Box<dyn std::error::Error + Send + Sync>> {
-    let request: CredentialRequest = serde_json::from_str(&value)?;
+    let request: CredentialRequest<'_> = serde_json::from_str(&value)?;
     if request.v != PROTOCOL_VERSION_1 {
         return Err(format!("unsupported protocol version {}", request.v).into());
     }
@@ -276,8 +276,8 @@ pub fn read_line() -> Result<String, io::Error> {
 
 /// Prompt the user for a token.
 pub fn read_token(
-    login_options: &LoginOptions,
-    registry: &RegistryInfo,
+    login_options: &LoginOptions<'_>,
+    registry: &RegistryInfo<'_>,
 ) -> Result<Secret<String>, Error> {
     if let Some(token) = &login_options.token {
         return Ok(token.to_owned());
@@ -387,7 +387,7 @@ mod tests {
             r#"{"v":1,"registry":{"index-url":"url"},"kind":"get","operation":"owners","name":"pkg"}"#
         );
 
-        let cr: CredentialRequest =
+        let cr: CredentialRequest<'_> =
             serde_json::from_str(r#"{"extra-1":true,"v":1,"registry":{"index-url":"url","extra-2":true},"kind":"get","operation":"owners","name":"pkg","args":[]}"#).unwrap();
         assert_eq!(cr, get_oweners);
     }
@@ -405,7 +405,7 @@ mod tests {
             action: Action::Logout,
         };
 
-        let cr: CredentialRequest = serde_json::from_str(
+        let cr: CredentialRequest<'_> = serde_json::from_str(
             r#"{"v":1,"registry":{"index-url":"url"},"kind":"logout","extra-1":true,"args":[]}"#,
         )
         .unwrap();
@@ -425,7 +425,7 @@ mod tests {
             action: Action::Unknown,
         };
 
-        let cr: CredentialRequest = serde_json::from_str(
+        let cr: CredentialRequest<'_> = serde_json::from_str(
             r#"{"v":1,"registry":{"index-url":""},"kind":"unexpected-1","extra-1":true,"args":[]}"#,
         )
         .unwrap();
diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-extern crate proc_macro;`
`2`		`-`
`3`	`1`	`use proc_macro::*;`
`4`	`2`	`use std::process::Command;`
`5`	`3`	`use std::sync::Once;`
Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,7 @@ impl HttpServer {`
`790`	`790`	`}`
`791`	`791`	`}`
`792`	`792`
`793`		`- fn check_authorized(&self, req: &Request, mutation: Option<Mutation>) -> bool {`
	`793`	`+ fn check_authorized(&self, req: &Request, mutation: Option<Mutation<'_>>) -> bool {`
`794`	`794`	`let (private_key, private_key_subject) = if mutation.is_some() \|\| self.auth_required {`
`795`	`795`	`match &self.token {`
`796`	`796`	`Token::Plaintext(token) => return Some(token) == req.authorization.as_ref(),`
`@@ -832,7 +832,8 @@ impl HttpServer {`
`832`	`832`	`url: &'a str,`
`833`	`833`	`kip: &'a str,`
`834`	`834`	`}`
`835`		`- let footer: Footer = t!(serde_json::from_slice(untrusted_token.untrusted_footer()).ok());`
	`835`	`+ let footer: Footer<'_> =`
	`836`	`+ t!(serde_json::from_slice(untrusted_token.untrusted_footer()).ok());`
`836`	`837`	`if footer.kip != paserk_pub_key_id {`
`837`	`838`	`return false;`
`838`	`839`	`}`
`@@ -846,7 +847,6 @@ impl HttpServer {`
`846`	`847`	`if footer.url != "https://github.com/rust-lang/crates.io-index"`
`847`	`848`	`&& footer.url != &format!("sparse+http://{}/index/", self.addr.to_string())`
`848`	`849`	`{`
`849`		`- dbg!(footer.url);`
`850`	`850`	`return false;`
`851`	`851`	`}`
`852`	`852`
`@@ -862,20 +862,18 @@ impl HttpServer {`
`862`	`862`	`_challenge: Option<&'a str>, // todo: PASETO with challenges`
`863`	`863`	`v: Option<u8>,`
`864`	`864`	`}`
`865`		`- let message: Message = t!(serde_json::from_str(trusted_token.payload()).ok());`
	`865`	`+ let message: Message<'_> = t!(serde_json::from_str(trusted_token.payload()).ok());`
`866`	`866`	`let token_time = t!(OffsetDateTime::parse(message.iat, &Rfc3339).ok());`
`867`	`867`	`let now = OffsetDateTime::now_utc();`
`868`	`868`	`if (now - token_time) > Duration::MINUTE {`
`869`	`869`	`return false;`
`870`	`870`	`}`
`871`	`871`	`if private_key_subject.as_deref() != message.sub {`
`872`		`- dbg!(message.sub);`
`873`	`872`	`return false;`
`874`	`873`	`}`
`875`	`874`	`// - If the claim v is set, that it has the value of 1.`
`876`	`875`	`if let Some(v) = message.v {`
`877`	`876`	`if v != 1 {`
`878`		`- dbg!(message.v);`
`879`	`877`	`return false;`
`880`	`878`	`}`
`881`	`879`	`}`
`@@ -885,22 +883,18 @@ impl HttpServer {`
`885`	`883`	`if let Some(mutation) = mutation {`
`886`	`884`	`// - That the operation matches the mutation field and is one of publish, yank, or unyank.`
`887`	`885`	`if message.mutation != Some(mutation.mutation) {`
`888`		`- dbg!(message.mutation);`
`889`	`886`	`return false;`
`890`	`887`	`}`
`891`	`888`	`// - That the package, and version match the request.`
`892`	`889`	`if message.name != mutation.name {`
`893`		`- dbg!(message.name);`
`894`	`890`	`return false;`
`895`	`891`	`}`
`896`	`892`	`if message.vers != mutation.vers {`
`897`		`- dbg!(message.vers);`
`898`	`893`	`return false;`
`899`	`894`	`}`
`900`	`895`	`// - If the mutation is publish, that the version has not already been published, and that the hash matches the request.`
`901`	`896`	`if mutation.mutation == "publish" {`
`902`	`897`	`if message.cksum != mutation.cksum {`
`903`		`- dbg!(message.cksum);`
`904`	`898`	`return false;`
`905`	`899`	`}`
`906`	`900`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ fn run() -> Result<(), Error> {`
`48`	`48`	`if same_file::is_same_file(source, &out_path).unwrap_or(false) {`
`49`	`49`	`bail!("cannot output to the same file as the source");`
`50`	`50`	`}`
`51`		`- println!("Converting {} -> {}", source.display(), out_path.display());`
	`51`	`+ eprintln!("Converting {} -> {}", source.display(), out_path.display());`
`52`	`52`	`let result = mdman::convert(&source, opts.format, opts.url.clone(), opts.man_map.clone())`
`53`	`53`	`.with_context(\|\| format!("failed to translate {}", source.display()))?;`
`54`	`54`