Auto merge of #7000 - matthewjasper:remove-unnecessary-outlives-bounds, r=alexcrichton

Remove unnecessary outlives bounds

cc rust-lang/rust#61172

src/cargo/core/compiler/build_context/mod.rs

@@ -16,7 +16,7 @@ mod target_info;
 pub use self::target_info::{FileFlavor, TargetInfo};
 
 /// The build context, containing all information about a build task.
-pub struct BuildContext<'a, 'cfg: 'a> {
+pub struct BuildContext<'a, 'cfg> {
     /// The workspace the build is for.
     pub ws: &'a Workspace<'cfg>,
     /// The cargo configuration.

src/cargo/core/compiler/context/compilation_files.rs

@@ -50,7 +50,7 @@ impl fmt::Display for Metadata {
     }
 }
 
-pub struct CompilationFiles<'a, 'cfg: 'a> {
+pub struct CompilationFiles<'a, 'cfg> {
     /// The target directory layout for the host (and target if it is the same as host).
     pub(super) host: Layout,
     /// The target directory layout for the target (if different from then host).

src/cargo/core/compiler/context/mod.rs

@@ -27,7 +27,7 @@ mod compilation_files;
 use self::compilation_files::CompilationFiles;
 pub use self::compilation_files::{Metadata, OutputFile};
 
-pub struct Context<'a, 'cfg: 'a> {
+pub struct Context<'a, 'cfg> {
     pub bcx: &'a BuildContext<'a, 'cfg>,
     pub compilation: Compilation<'cfg>,
     pub build_state: Arc<BuildState>,

src/cargo/core/compiler/context/unit_dependencies.rs

@@ -25,7 +25,7 @@ use crate::CargoResult;
 use log::trace;
 use std::collections::{HashMap, HashSet};
 
-struct State<'a: 'tmp, 'cfg: 'a, 'tmp> {
+struct State<'a, 'cfg, 'tmp> {
     cx: &'tmp mut Context<'a, 'cfg>,
     waiting_on_download: HashSet<PackageId>,
     downloads: Downloads<'a, 'cfg>,

src/cargo/core/package.rs

@@ -290,7 +290,7 @@ pub struct PackageSet<'cfg> {
 }
 
 /// Helper for downloading crates.
-pub struct Downloads<'a, 'cfg: 'a> {
+pub struct Downloads<'a, 'cfg> {
     set: &'a PackageSet<'cfg>,
     /// When a download is started, it is added to this map. The key is a
     /// "token" (see `Download::token`). It is removed once the download is

src/cargo/core/resolver/encode.rs

@@ -325,7 +325,7 @@ impl<'de> de::Deserialize<'de> for EncodablePackageId {
     }
 }
 
-pub struct WorkspaceResolve<'a, 'cfg: 'a> {
+pub struct WorkspaceResolve<'a, 'cfg> {
     pub ws: &'a Workspace<'cfg>,
     pub resolve: &'a Resolve,
 }

src/cargo/core/workspace.rs

@@ -125,7 +125,7 @@ pub struct WorkspaceRootConfig {
 
 /// An iterator over the member packages of a workspace, returned by
 /// `Workspace::members`
-pub struct Members<'a, 'cfg: 'a> {
+pub struct Members<'a, 'cfg> {
     ws: &'a Workspace<'cfg>,
     iter: slice::Iter<'a, PathBuf>,
 }