Rename get_self_contained_lib_path

diff --git a/src/librustc_codegen_ssa/back/link.rs b/src/librustc_codegen_ssa/back/link.rs
index ae1e4da75333176459cd34451875db5b61feae2b..39f54b83a23bc10a018865e9e1f016f4dab4a712 100644 (file)
--- a/src/librustc_codegen_ssa/back/link.rs
+++ b/src/librustc_codegen_ssa/back/link.rs
@@ -1090,7 +1090,7 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
     }
     // Special directory with objects used only in self-contained linkage mode
     if self_contained {
-        let file_path = fs.get_selfcontained_lib_path().join(name);
+        let file_path = fs.get_self_contained_lib_path().join(name);
         if file_path.exists() {
             return file_path;
         }
@@ -1500,7 +1500,7 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
 
     // Special directory with libraries used only in self-contained linkage mode
     if self_contained {
-        let lib_path = sess.target_filesearch(PathKind::All).get_selfcontained_lib_path();
+        let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
         cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
     }
 }

diff --git a/src/librustc_session/filesearch.rs b/src/librustc_session/filesearch.rs
index 675a880cef47c4c98fb2a6609ab0ea7e1a99feb6..27396c524f4e6f4134dfeee763fd2f77a7cf283f 100644 (file)
--- a/src/librustc_session/filesearch.rs
+++ b/src/librustc_session/filesearch.rs
@@ -41,7 +41,7 @@ pub fn get_lib_path(&self) -> PathBuf {
         make_target_lib_path(self.sysroot, self.triple)
     }
 
-    pub fn get_selfcontained_lib_path(&self) -> PathBuf {
+    pub fn get_self_contained_lib_path(&self) -> PathBuf {
         self.get_lib_path().join("self-contained")
     }