Skip to content

Commit a13ff3d

Browse files
authored
Rollup merge of rust-lang#63287 - Mark-Simulacrum:span-no-ref, r=Centril
Don't store &Span This is just needless indirection.
2 parents f0e34c9 + 288b4e9 commit a13ff3d

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/librustc_mir/interpret/snapshot.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl_stable_hash_for!(enum crate::interpret::eval_context::StackPopCleanup {
305305
#[derive(Eq, PartialEq)]
306306
struct FrameSnapshot<'a, 'tcx> {
307307
instance: &'a ty::Instance<'tcx>,
308-
span: &'a Span,
308+
span: Span,
309309
return_to_block: &'a StackPopCleanup,
310310
return_place: Option<Place<(), AllocIdSnapshot<'a>>>,
311311
locals: IndexVec<mir::Local, LocalValue<(), AllocIdSnapshot<'a>>>,
@@ -345,7 +345,7 @@ impl<'a, 'mir, 'tcx, Ctx> Snapshot<'a, Ctx> for &'a Frame<'mir, 'tcx>
345345

346346
FrameSnapshot {
347347
instance,
348-
span,
348+
span: *span,
349349
return_to_block,
350350
block,
351351
stmt: *stmt,

src/librustc_resolve/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ enum ResolutionError<'a> {
171171
GenericParamsFromOuterFunction(Res),
172172
/// Error E0403: the name is already used for a type or const parameter in this generic
173173
/// parameter list.
174-
NameAlreadyUsedInParameterList(Name, &'a Span),
174+
NameAlreadyUsedInParameterList(Name, Span),
175175
/// Error E0407: method is not a member of trait.
176176
MethodNotMemberOfTrait(Name, &'a str),
177177
/// Error E0437: type is not a member of trait.
@@ -297,7 +297,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver<'_>,
297297
parameter in this list of generic parameters",
298298
name);
299299
err.span_label(span, "already used");
300-
err.span_label(first_use_span.clone(), format!("first use of `{}`", name));
300+
err.span_label(first_use_span, format!("first use of `{}`", name));
301301
err
302302
}
303303
ResolutionError::MethodNotMemberOfTrait(method, trait_) => {
@@ -2839,7 +2839,7 @@ impl<'a> Resolver<'a> {
28392839
let span = seen_bindings.get(&ident).unwrap();
28402840
let err = ResolutionError::NameAlreadyUsedInParameterList(
28412841
ident.name,
2842-
span,
2842+
*span,
28432843
);
28442844
resolve_error(self, param.ident.span, err);
28452845
}
@@ -2861,7 +2861,7 @@ impl<'a> Resolver<'a> {
28612861
let span = seen_bindings.get(&ident).unwrap();
28622862
let err = ResolutionError::NameAlreadyUsedInParameterList(
28632863
ident.name,
2864-
span,
2864+
*span,
28652865
);
28662866
resolve_error(self, param.ident.span, err);
28672867
}

0 commit comments

Comments
 (0)