Misc code review changes

This commit is contained in:
cjkenn 2017-10-19 23:06:22 -07:00
parent 24b4dfcf1b
commit 6f30ce0be2
2 changed files with 3 additions and 2 deletions

View File

@ -388,7 +388,8 @@ pub struct TypeckTables<'tcx> {
/// Set of trait imports actually used in the method resolution. /// Set of trait imports actually used in the method resolution.
/// This is used for warning unused imports. During type /// This is used for warning unused imports. During type
/// checking, this field should not be cloned. /// checking, this `Rc` should not be cloned: it must have a ref-count
/// of 1 so that we can insert things into the set mutably.
pub used_trait_imports: Rc<DefIdSet>, pub used_trait_imports: Rc<DefIdSet>,
/// If any errors occurred while type-checking this body, /// If any errors occurred while type-checking this body,

View File

@ -850,7 +850,7 @@ fn has_typeck_tables<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
fn used_trait_imports<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, fn used_trait_imports<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
def_id: DefId) def_id: DefId)
-> Rc<DefIdSet> { -> Rc<DefIdSet> {
Rc::clone(&tcx.typeck_tables_of(def_id).used_trait_imports) tcx.typeck_tables_of(def_id).used_trait_imports.clone()
} }
fn typeck_tables_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, fn typeck_tables_of<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,