X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustdoc%2Fclean%2Fauto_trait.rs;h=40c59ed1e0b755b11a57e34cbef047f5eeafa49f;hb=44e226ceb753075b44bcaadf349b1d1b6a23ad8d;hp=72603f00697ee1f5a4f875d47a4a257a88a28a91;hpb=bdd0a78582efd17f588b35e3e227a65617d5afec;p=rust.git diff --git a/src/librustdoc/clean/auto_trait.rs b/src/librustdoc/clean/auto_trait.rs index 72603f00697..40c59ed1e0b 100644 --- a/src/librustdoc/clean/auto_trait.rs +++ b/src/librustdoc/clean/auto_trait.rs @@ -61,10 +61,10 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { .params .iter() .filter_map(|param| match param.kind { - ty::GenericParamDefKind::Lifetime => Some(param.name.to_string()), + ty::GenericParamDefKind::Lifetime => Some(param.name), _ => None, }) - .map(|name| (name.clone(), Lifetime(name))) + .map(|name| (name, Lifetime(name))) .collect(); let lifetime_predicates = self.handle_lifetimes(®ion_data, &names_map); let new_generics = self.param_env_to_generics( @@ -145,21 +145,21 @@ impl<'a, 'tcx> AutoTraitFinder<'a, 'tcx> { fn get_lifetime( &self, region: Region<'_>, - names_map: &FxHashMap, + names_map: &FxHashMap, ) -> Lifetime { self.region_name(region) .map(|name| { names_map.get(&name).unwrap_or_else(|| { - panic!("Missing lifetime with name {:?} for {:?}", name, region) + panic!("Missing lifetime with name {:?} for {:?}", name.as_str(), region) }) }) .unwrap_or(&Lifetime::statik()) .clone() } - fn region_name(&self, region: Region<'_>) -> Option { + fn region_name(&self, region: Region<'_>) -> Option { match region { - &ty::ReEarlyBound(r) => Some(r.name.to_string()), + &ty::ReEarlyBound(r) => Some(r.name), _ => None, } } @@ -177,7 +177,7 @@ fn region_name(&self, region: Region<'_>) -> Option { fn handle_lifetimes<'cx>( &self, regions: &RegionConstraintData<'cx>, - names_map: &FxHashMap, + names_map: &FxHashMap, ) -> Vec { // Our goal is to 'flatten' the list of constraints by eliminating // all intermediate RegionVids. At the end, all constraints should