Skip to content

Commit 04df75a

Browse files
authored
Rollup merge of #82236 - matthiaskrgr:useless_conv, r=jyn514
avoid converting types into themselves (clippy::useless_conversion)
2 parents 01104b5 + ec50a20 commit 04df75a

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

compiler/rustc_parse/src/parser/expr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ impl<'a> Parser<'a> {
513513
token::Ident(..) if this.is_mistaken_not_ident_negation() => {
514514
make_it!(this, attrs, |this, _| this.recover_not_expr(lo))
515515
}
516-
_ => return this.parse_dot_or_call_expr(Some(attrs.into())),
516+
_ => return this.parse_dot_or_call_expr(Some(attrs)),
517517
}
518518
}
519519

compiler/rustc_parse/src/parser/stmt.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl<'a> Parser<'a> {
9797
self.mk_stmt(lo, StmtKind::Empty)
9898
} else if self.token != token::CloseDelim(token::Brace) {
9999
// Remainder are line-expr stmts.
100-
let e = self.parse_expr_res(Restrictions::STMT_EXPR, Some(attrs.into()))?;
100+
let e = self.parse_expr_res(Restrictions::STMT_EXPR, Some(attrs))?;
101101
self.mk_stmt(lo.to(e.span), StmtKind::Expr(e))
102102
} else {
103103
self.error_outer_attrs(&attrs.take_for_recovery());
@@ -131,7 +131,7 @@ impl<'a> Parser<'a> {
131131
};
132132

133133
let expr = this.with_res(Restrictions::STMT_EXPR, |this| {
134-
let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs.into())?;
134+
let expr = this.parse_dot_or_call_expr_with(expr, lo, attrs)?;
135135
this.parse_assoc_expr_with(0, LhsExpr::AlreadyParsed(expr))
136136
})?;
137137
Ok((
@@ -213,7 +213,7 @@ impl<'a> Parser<'a> {
213213
}
214214

215215
fn recover_local_after_let(&mut self, lo: Span, attrs: AttrVec) -> PResult<'a, Stmt> {
216-
let local = self.parse_local(attrs.into())?;
216+
let local = self.parse_local(attrs)?;
217217
Ok(self.mk_stmt(lo.to(self.prev_token.span), StmtKind::Local(local)))
218218
}
219219

compiler/rustc_typeck/src/astconv/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1468,7 +1468,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
14681468
}),
14691469
assoc_name,
14701470
)
1471-
.into_iter()
14721471
},
14731472
|| param_name.to_string(),
14741473
assoc_name,

src/bootstrap/install.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ fn install_sh(
5353
}
5454

5555
fn default_path(config: &Option<PathBuf>, default: &str) -> PathBuf {
56-
PathBuf::from(config.as_ref().cloned().unwrap_or_else(|| PathBuf::from(default)))
56+
config.as_ref().cloned().unwrap_or_else(|| PathBuf::from(default))
5757
}
5858

5959
fn prepare_dir(mut path: PathBuf) -> String {

src/librustdoc/core.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ impl<'tcx> DocContext<'tcx> {
161161
}
162162
Entry::Occupied(e) => e.into_mut(),
163163
};
164-
*def_index = DefIndex::from(*def_index + 1);
164+
*def_index = *def_index + 1;
165165

166166
DefId { krate: crate_num, index: *def_index }
167167
}

src/librustdoc/json/conversions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ fn from_clean_item_kind(item: clean::ItemKind, tcx: TyCtxt<'_>) -> ItemEnum {
182182
bounds: g.into_iter().map(Into::into).collect(),
183183
default: t.map(Into::into),
184184
},
185-
StrippedItem(inner) => from_clean_item_kind(*inner, tcx).into(),
185+
StrippedItem(inner) => from_clean_item_kind(*inner, tcx),
186186
PrimitiveItem(_) | KeywordItem(_) => {
187187
panic!("{:?} is not supported for JSON output", item)
188188
}

0 commit comments

Comments
 (0)