rustc_metadata: reduce repetition

Author: tamird

compiler/rustc_metadata/src/locator.rs

@@ -709,48 +709,39 @@ impl<'a> CrateLocator<'a> {
 letmut rmetas = FxIndexMap::default();
 letmut dylibs = FxIndexMap::default();
 for loc in&self.exact_paths{
-if !loc.canonicalized().exists(){
-returnErr(CrateError::ExternLocationNotExist(
-self.crate_name,
- loc.original().clone(),
-));
+let loc_canon = loc.canonicalized();
+let loc_orig = loc.original();
+if !loc_canon.exists(){
+returnErr(CrateError::ExternLocationNotExist(self.crate_name, loc_orig.clone()));
 }
-if !loc.original().is_file(){
-returnErr(CrateError::ExternLocationNotFile(
-self.crate_name,
- loc.original().clone(),
-));
+if !loc_orig.is_file(){
+returnErr(CrateError::ExternLocationNotFile(self.crate_name, loc_orig.clone()));
 }
-letSome(file) = loc.original().file_name().and_then(|s| s.to_str())else{
-returnErr(CrateError::ExternLocationNotFile(
-self.crate_name,
- loc.original().clone(),
-));
+// Note to take care and match against the non-canonicalized name:
+// some systems save build artifacts into content-addressed stores
+// that do not preserve extensions, and then link to them using
+// e.g. symbolic links. If we canonicalize too early, we resolve
+// the symlink, the file type is lost and we might treat rlibs and
+// rmetas as dylibs.
+letSome(file) = loc_orig.file_name().and_then(|s| s.to_str())else{
+returnErr(CrateError::ExternLocationNotFile(self.crate_name, loc_orig.clone()));
 };
-
 if file.starts_with("lib") && (file.ends_with(".rlib") || file.ends_with(".rmeta"))
  || file.starts_with(self.target.dll_prefix.as_ref())
  && file.ends_with(self.target.dll_suffix.as_ref())
 {
-// Note to take care and match against the non-canonicalized name:
-// some systems save build artifacts into content-addressed stores
-// that do not preserve extensions, and then link to them using
-// e.g. symbolic links. If we canonicalize too early, we resolve
-// the symlink, the file type is lost and we might treat rlibs and
-// rmetas as dylibs.
-let loc_canon = loc.canonicalized().clone();
-let loc = loc.original();
-if loc.file_name().unwrap().to_str().unwrap().ends_with(".rlib"){
+let loc_canon = loc_canon.clone();
+if file.ends_with(".rlib"){
  rlibs.insert(loc_canon,PathKind::ExternFlag);
-}elseifloc.file_name().unwrap().to_str().unwrap().ends_with(".rmeta"){
+}elseiffile.ends_with(".rmeta"){
  rmetas.insert(loc_canon,PathKind::ExternFlag);
 }else{
  dylibs.insert(loc_canon,PathKind::ExternFlag);
 }
 }else{
 self.crate_rejections
 .via_filename
-.push(CrateMismatch{path:loc.original().clone(),got:String::new()});
+.push(CrateMismatch{path:loc_orig.clone(),got:String::new()});
 }
 }