compiles

Signed-off-by: Zahari Dichev <[email protected]>

Author: zaharidichev

compiler/rustc_arena/src/lib.rs

@@ -733,10 +733,10 @@ macro_rules! declare_arena {
                 self.dropless.alloc_slice(value)
             }
 
-            pub fn alloc_from_iter<'a, T: ArenaAllocatable<'tcx, U>, U>(
-                &'a self,
-                iter: impl ::std::iter::IntoIterator<Item = T>,
-            ) -> &'a mut [T] {
+            pub fn alloc_from_iter<T: ArenaAllocatable<'tcx, U>, U, V: IntoIterator<Item = T>>(
+                &self,
+                iter: V,
+            ) -> &mut [T] {
                 T::allocate_from_iter(self, iter)
             }
         }

compiler/rustc_ast/src/attr/mod.rs

@@ -497,12 +497,10 @@ impl MetaItemKind {
     fn token_trees_and_spacings(&self, span: Span) -> Vec<TreeAndSpacing> {
         match *self {
             MetaItemKind::Word => vec![],
-            MetaItemKind::NameValue(ref lit) => {
-                vec![
-                    TokenTree::token(token::Eq, span).into(),
-                    TokenTree::Token(lit.to_token()).into(),
-                ]
-            }
+            MetaItemKind::NameValue(ref lit) => vec![
+                TokenTree::token(token::Eq, span).into(),
+                TokenTree::Token(lit.to_token()).into(),
+            ],
             MetaItemKind::List(ref list) => {
                 let mut tokens = Vec::new();
                 for (i, item) in list.iter().enumerate() {

compiler/rustc_middle/src/ty/codec.rs

@@ -160,7 +160,6 @@ encodable_via_deref! {
 pub trait TyDecoder<'tcx>: Decoder {
     const CLEAR_CROSS_CRATE: bool;
 
-    //fn tcx(&self) -> TyCtxt<'tcx>;
     fn interner(&self) -> TyInterner<'tcx>;
 
     fn peek_byte(&self) -> u8;

compiler/rustc_middle/src/ty/context.rs

@@ -52,7 +52,6 @@ use rustc_hir::{
 };
 use rustc_index::vec::{Idx, IndexVec};
 use rustc_macros::HashStable;
-use rustc_middle::arena::ArenaAllocatable;
 use rustc_serialize::opaque::{FileEncodeResult, FileEncoder};
 use rustc_session::config::{BorrowckMode, CrateType, OutputFilenames};
 use rustc_session::lint::{Level, Lint};
@@ -193,7 +192,7 @@ impl<'tcx> Interner for TyInterner<'tcx> {
         self,
         iter: impl IntoIterator<Item = Self::Span>,
     ) -> Self::AllocatedSpanSlice {
-        self.tcx.arena.alloc_from_iter(iter)
+        self.tcx.arena.alloc_from_iter::<Self::Span, Self::Span, _>(iter)
     }
 
     fn alloc_promoted(self, value: Self::Promoted) -> Self::AllocatedPromoted {

compiler/rustc_middle/src/ty/query/on_disk_cache.rs

@@ -754,11 +754,6 @@ where
 impl<'a, 'tcx> TyDecoder<'tcx> for CacheDecoder<'a, 'tcx> {
     const CLEAR_CROSS_CRATE: bool = false;
 
-    // #[inline]
-    // fn tcx(&self) -> TyCtxt<'tcx> {
-    //     self.tcx
-    // }
-
     #[inline]
     fn interner(&self) -> TyInterner<'tcx> {
         self.tcx.interner()