Skip to content

Commit 658420a

Browse files
committed
formatting
1 parent df6345a commit 658420a

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/libcore/os.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ pub fn family() -> ~str { ~"unix" }
850850

851851
#[cfg(windows)]
852852
pub fn family() -> ~str { ~"windows" }
853-
853+
854854

855855
mod consts {
856856

@@ -886,7 +886,7 @@ mod consts {
886886
pub fn dll_suffix() -> ~str { ~".so" }
887887
pub fn exe_suffix() -> ~str { ~"" }
888888
}
889-
889+
890890
pub mod win32 {
891891
pub fn sysname() -> ~str { ~"win32" }
892892
pub fn dll_prefix() -> ~str { ~"" }

src/librustc/back/link.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,10 @@ fn output_dll_filename(os: session::os, lm: &link_meta) -> ~str {
639639
session::os_macos =>
640640
macos::dll_prefix() + libname + macos::dll_suffix(),
641641
session::os_freebsd =>
642-
freebsd::dll_prefix() + libname + macos::dll_suffix(),
642+
freebsd::dll_prefix() + libname + freebsd::dll_suffix(),
643643
session::os_linux =>
644-
freebsd::dll_prefix() + libname + macos::dll_suffix(),
645-
session::os_win32 =>
644+
linux::dll_prefix() + libname + linux::dll_suffix(),
645+
session::os_win32 =>
646646
win32::dll_prefix() + libname + win32::dll_suffix(),
647647
}
648648
}
@@ -665,8 +665,7 @@ fn link_binary(sess: Session,
665665

666666
let output = if sess.building_library {
667667
let long_libname = output_dll_filename(sess.targ_cfg.os, &lm);
668-
669-
debug!("link_meta.name: %s", lm.name);
668+
debug!("link_meta.name: %s", lm.name);
670669
debug!("long_libname: %s", long_libname);
671670
debug!("out_filename: %s", out_filename.to_str());
672671
debug!("dirname(out_filename): %s", out_filename.dir_path().to_str());

src/librustc/metadata/loader.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ fn find_library_crate(cx: ctxt) -> Option<{ident: ~str, data: @~[u8]}> {
6868
fn libname(cx: ctxt) -> {prefix: ~str, suffix: ~str} {
6969
if cx.static { return {prefix: ~"lib", suffix: ~".rlib"}; }
7070
match cx.os {
71-
os_win32 => return {prefix: win32::dll_prefix(),
71+
os_win32 => return {prefix: win32::dll_prefix(),
7272
suffix: win32::dll_suffix()},
7373
os_macos => return {prefix: macos::dll_prefix(),
7474
suffix: macos::dll_suffix()},
75-
os_linux => return {prefix: linux::dll_prefix(),
75+
os_linux => return {prefix: linux::dll_prefix(),
7676
suffix: linux::dll_suffix()},
77-
os_freebsd => return {prefix: freebsd::dll_prefix(),
77+
os_freebsd => return {prefix: freebsd::dll_prefix(),
7878
suffix: freebsd::dll_suffix()}
7979
}
8080
}

0 commit comments

Comments
 (0)