mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std: Stop reexporting the contents of 'mod consts'

Browse Source 
This prevents usage of the win32 utf-16 helper functions from outside of libstd.

Closes #9053
This commit is contained in:
Alex Crichton 2013-12-18 09:57:00 -08:00
parent 0dcdefcf7e
commit 3dc38b0c51
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiletest/runtest.rs
View File

@ -757,8 +757,8 @@ fn make_lib_name(config: &config, auxfile: &Path, testfile: &Path) -> Path {
fn make_exe_name(config: &config, testfile: &Path) -> Path {
let mut f = output_base_name(config, testfile);
if !os::EXE_SUFFIX.is_empty() {
match f.filename().map(|s| s + os::EXE_SUFFIX.as_bytes()) {
if !os::consts::EXE_SUFFIX.is_empty() {
match f.filename().map(|s| s + os::consts::EXE_SUFFIX.as_bytes()) {
Some(v) => f.set_filename(v),
None => ()
}

2
src/librustpkg/path_util.rs
View File

@ -390,7 +390,7 @@ pub fn mk_output_path(what: OutputType, where: Target,
Bench => "bench",
_ => ""
},
os::EXE_SUFFIX))
os::consts::EXE_SUFFIX))
};
if !output_path.is_absolute() {
output_path = os::getcwd().join(&output_path);

4
src/libstd/os.rs
View File

@ -43,8 +43,6 @@ use to_str;
use unstable::finally::Finally;
use sync::atomics::{AtomicInt, INIT_ATOMIC_INT, SeqCst};
pub use os::consts::*;
/// Delegates to the libc close() function, returning the same return value.
pub fn close(fd: c_int) -> c_int {
unsafe {
@ -334,7 +332,7 @@ pub fn pipe() -> Pipe {
/// Returns the proper dll filename for the given basename of a file.
pub fn dll_filename(base: &str) -> ~str {
format!("{}{}{}", DLL_PREFIX, base, DLL_SUFFIX)
format!("{}{}{}", consts::DLL_PREFIX, base, consts::DLL_SUFFIX)
}
/// Optionally returns the filesystem path to the current executable which is