Rollup merge of rust-lang#63287 - Mark-Simulacrum:span-no-ref, r=Centril

Don't store &Span This is just needless indirection.
Centril · Aug 6, 2019 · 7462e55 · 7462e55
2 parents e1ee3eb + 288b4e9
commit 7462e55
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/librustc_mir/interpret/snapshot.rs b/src/librustc_mir/interpret/snapshot.rs
@@ -305,7 +305,7 @@ impl_stable_hash_for!(enum crate::interpret::eval_context::StackPopCleanup {
 #[derive(Eq, PartialEq)]
 struct FrameSnapshot<'a, 'tcx> {
     instance: &'a ty::Instance<'tcx>,
-    span: &'a Span,
+    span: Span,
     return_to_block: &'a StackPopCleanup,
     return_place: Option<Place<(), AllocIdSnapshot<'a>>>,
     locals: IndexVec<mir::Local, LocalValue<(), AllocIdSnapshot<'a>>>,
@@ -345,7 +345,7 @@ impl<'a, 'mir, 'tcx, Ctx> Snapshot<'a, Ctx> for &'a Frame<'mir, 'tcx>
 
         FrameSnapshot {
             instance,
-            span,
+            span: *span,
             return_to_block,
             block,
             stmt: *stmt,

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
@@ -171,7 +171,7 @@ enum ResolutionError<'a> {
     GenericParamsFromOuterFunction(Res),
     /// Error E0403: the name is already used for a type or const parameter in this generic
     /// parameter list.
-    NameAlreadyUsedInParameterList(Name, &'a Span),
+    NameAlreadyUsedInParameterList(Name, Span),
     /// Error E0407: method is not a member of trait.
     MethodNotMemberOfTrait(Name, &'a str),
     /// Error E0437: type is not a member of trait.
@@ -297,7 +297,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver<'_>,
                                             parameter in this list of generic parameters",
                                             name);
              err.span_label(span, "already used");
-             err.span_label(first_use_span.clone(), format!("first use of `{}`", name));
+             err.span_label(first_use_span, format!("first use of `{}`", name));
              err
         }
         ResolutionError::MethodNotMemberOfTrait(method, trait_) => {
@@ -2839,7 +2839,7 @@ impl<'a> Resolver<'a> {
                                 let span = seen_bindings.get(&ident).unwrap();
                                 let err = ResolutionError::NameAlreadyUsedInParameterList(
                                     ident.name,
-                                    span,
+                                    *span,
                                 );
                                 resolve_error(self, param.ident.span, err);
                             }
@@ -2861,7 +2861,7 @@ impl<'a> Resolver<'a> {
                                 let span = seen_bindings.get(&ident).unwrap();
                                 let err = ResolutionError::NameAlreadyUsedInParameterList(
                                     ident.name,
-                                    span,
+                                    *span,
                                 );
                                 resolve_error(self, param.ident.span, err);
                             }