Skip to content

Commit

Permalink
Auto merge of #10238 - Aaron1011:remove-lifetimes, r=joshtriplett
Browse files Browse the repository at this point in the history
Remove unused lifetimes

This is blocking the Crater run in rust-lang/rust#92413,
since a 'try' build needs to build Cargo.
  • Loading branch information
bors committed Dec 30, 2021
2 parents 1f12b88 + c8761d4 commit 9af67cf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/resolver/encode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ impl<'de> de::Deserialize<'de> for EncodablePackageId {
}
}

impl<'a> ser::Serialize for Resolve {
impl ser::Serialize for Resolve {
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
S: ser::Serializer,
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/cargo_compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub struct CompileOptions {
pub honor_rust_version: bool,
}

impl<'a> CompileOptions {
impl CompileOptions {
pub fn new(config: &Config, mode: CompileMode) -> CargoResult<CompileOptions> {
Ok(CompileOptions {
build_config: BuildConfig::new(config, None, &[], mode)?,
Expand Down

0 comments on commit 9af67cf

Please sign in to comment.