Skip to content

Commit f97b11c

Browse files
committed
Auto merge of #7000 - matthewjasper:remove-unnecessary-outlives-bounds, r=alexcrichton
Remove unnecessary outlives bounds cc rust-lang/rust#61172
2 parents fb00b47 + 46615d2 commit f97b11c

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ mod target_info;
1616
pub use self::target_info::{FileFlavor, TargetInfo};
1717

1818
/// The build context, containing all information about a build task.
19-
pub struct BuildContext<'a, 'cfg: 'a> {
19+
pub struct BuildContext<'a, 'cfg> {
2020
/// The workspace the build is for.
2121
pub ws: &'a Workspace<'cfg>,
2222
/// The cargo configuration.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl fmt::Display for Metadata {
5050
}
5151
}
5252

53-
pub struct CompilationFiles<'a, 'cfg: 'a> {
53+
pub struct CompilationFiles<'a, 'cfg> {
5454
/// The target directory layout for the host (and target if it is the same as host).
5555
pub(super) host: Layout,
5656
/// The target directory layout for the target (if different from then host).

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mod compilation_files;
2727
use self::compilation_files::CompilationFiles;
2828
pub use self::compilation_files::{Metadata, OutputFile};
2929

30-
pub struct Context<'a, 'cfg: 'a> {
30+
pub struct Context<'a, 'cfg> {
3131
pub bcx: &'a BuildContext<'a, 'cfg>,
3232
pub compilation: Compilation<'cfg>,
3333
pub build_state: Arc<BuildState>,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use crate::CargoResult;
2525
use log::trace;
2626
use std::collections::{HashMap, HashSet};
2727

28-
struct State<'a: 'tmp, 'cfg: 'a, 'tmp> {
28+
struct State<'a, 'cfg, 'tmp> {
2929
cx: &'tmp mut Context<'a, 'cfg>,
3030
waiting_on_download: HashSet<PackageId>,
3131
downloads: Downloads<'a, 'cfg>,

src/cargo/core/package.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ pub struct PackageSet<'cfg> {
290290
}
291291

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

src/cargo/core/resolver/encode.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ impl<'de> de::Deserialize<'de> for EncodablePackageId {
325325
}
326326
}
327327

328-
pub struct WorkspaceResolve<'a, 'cfg: 'a> {
328+
pub struct WorkspaceResolve<'a, 'cfg> {
329329
pub ws: &'a Workspace<'cfg>,
330330
pub resolve: &'a Resolve,
331331
}

src/cargo/core/workspace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub struct WorkspaceRootConfig {
125125

126126
/// An iterator over the member packages of a workspace, returned by
127127
/// `Workspace::members`
128-
pub struct Members<'a, 'cfg: 'a> {
128+
pub struct Members<'a, 'cfg> {
129129
ws: &'a Workspace<'cfg>,
130130
iter: slice::Iter<'a, PathBuf>,
131131
}

0 commit comments

Comments
 (0)