From 3dc38b0c51f8b98ea550b5a3842c87884f10fa8d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 18 Dec 2013 09:57:00 -0800
Subject: [PATCH] std: Stop reexporting the contents of 'mod consts'

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

Closes #9053
---
 src/compiletest/runtest.rs  | 4 ++--
 src/librustpkg/path_util.rs | 2 +-
 src/libstd/os.rs            | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 4176c6698c9..b22c17fb438 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -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 => ()
         }
diff --git a/src/librustpkg/path_util.rs b/src/librustpkg/path_util.rs
index a6b1088335c..0d927fc36ae 100644
--- a/src/librustpkg/path_util.rs
+++ b/src/librustpkg/path_util.rs
@@ -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);
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index 43a9390bfb6..8f2f2190885 100644
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -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