Convert more core types to camel case

Author: brson

src/cargo/cargo.rs

@@ -8,7 +8,7 @@ import rustc::metadata::filesearch::{get_cargo_root, get_cargo_root_nearest,
 import syntax::diagnostic;
 
 import result::{ok, err};
-import io::writer_util;
+import io::WriterUtil;
 import std::{map, json, tempfile, term, sort, getopts};
 import map::hashmap;
 import to_str::to_str;

src/compiletest/procsrv.rs

@@ -1,5 +1,5 @@
 import run::spawn_process;
-import io::writer_util;
+import io::WriterUtil;
 import libc::{c_int, pid_t};
 
 import pipes::chan;

src/compiletest/runtest.rs

@@ -1,4 +1,4 @@
-import io::writer_util;
+import io::WriterUtil;
 
 import common::mode_run_pass;
 import common::mode_run_fail;
@@ -339,7 +339,7 @@ fn compose_and_run_compiler(
                     config.compile_lib_path, input)
 }
 
-fn ensure_dir(path: path) {
+fn ensure_dir(path: Path) {
     if os::path_is_dir(path) { return; }
     if !os::make_dir(path, 0x1c0i32) {
         fail fmt!{"can't make dir %s", path};
@@ -455,7 +455,7 @@ fn dump_output_file(config: config, testfile: ~str,
                     out: ~str, extension: ~str) {
     let outfile = make_out_name(config, testfile, extension);
     let writer = result::get(
-        io::file_writer(outfile, ~[io::create, io::truncate]));
+        io::file_writer(outfile, ~[io::Create, io::Truncate]));
     writer.write_str(out);
 }
 

src/etc/combine-tests.py

@@ -54,7 +54,7 @@ def scrub(b):
 d.write("use std;\n")
 d.write("use run_pass_stage2;\n")
 d.write("import run_pass_stage2::*;\n")
-d.write("import io::writer_util;\n");
+d.write("import io::WriterUtil;\n");
 d.write("fn main() {\n");
 d.write("    let out = io::stdout();\n");
 i = 0

src/fuzzer/fuzzer.rs

@@ -1,4 +1,4 @@
-import io::writer_util;
+import io::WriterUtil;
 
 import syntax::{ast, ast_util, fold, visit, codemap};
 import syntax::parse;
@@ -10,7 +10,7 @@ type context = { mode: test_mode }; // + rng
 
 fn write_file(filename: ~str, content: ~str) {
     result::get(
-        io::file_writer(filename, ~[io::create, io::truncate]))
+        io::file_writer(filename, ~[io::Create, io::Truncate]))
         .write_str(content);
 }
 
@@ -216,9 +216,9 @@ fn under(n: uint, it: fn(uint)) {
     while i < n { it(i); i += 1u; }
 }
 
-fn devnull() -> io::writer { io::mem_buffer_writer(io::mem_buffer()) }
+fn devnull() -> io::Writer { io::mem_buffer_writer(io::mem_buffer()) }
 
-fn as_str(f: fn@(io::writer)) -> ~str {
+fn as_str(f: fn@(io::Writer)) -> ~str {
     let buf = io::mem_buffer();
     f(io::mem_buffer_writer(buf));
     io::mem_buffer_str(buf)

src/libcore/core.rc

@@ -54,6 +54,7 @@ export send_map;
 export hash;
 export cmp;
 export num;
+export path;
 
 // NDM seems to be necessary for resolve to work
 export option_iter;
@@ -214,11 +215,16 @@ mod pipes;
 
 // Runtime and language-primitive support
 
+#[warn(non_camel_case_types)]
 mod io;
 mod libc;
+#[warn(non_camel_case_types)]
 mod os;
+#[warn(non_camel_case_types)]
 mod path;
+#[warn(non_camel_case_types)]
 mod rand;
+#[warn(non_camel_case_types)]
 mod run;
 #[warn(non_camel_case_types)]
 mod sys;

src/libcore/core.rs

@@ -4,7 +4,7 @@
 
 import option::{some, none};
 import option = option::option;
-import path = path::path;
+import Path = path::Path;
 import tuple::{TupleOps, ExtendedTupleOps};
 import str::{str_slice, unique_str};
 import vec::{const_vector, copyable_vector, immutable_vector};
@@ -14,7 +14,7 @@ import num::Num;
 import ptr::ptr;
 import to_str::ToStr;
 
-export path, option, some, none, unreachable;
+export Path, option, some, none, unreachable;
 export extensions;
 // The following exports are the extension impls for numeric types
 export Num, times, timesi;

src/libcore/hash.rs

@@ -13,8 +13,8 @@
  * CPRNG like rand::rng.
  */
 
-import io::writer;
-import io::writer_util;
+import io::Writer;
+import io::WriterUtil;
 
 export Streaming, State;
 export default_state;
@@ -126,7 +126,7 @@ fn SipState(key0: u64, key1: u64) -> SipState {
 }
 
 
-impl &SipState : io::writer {
+impl &SipState : io::Writer {
 
     // Methods for io::writer
     fn write(msg: &[const u8]) {
@@ -209,7 +209,7 @@ impl &SipState : io::writer {
         self.ntail = left;
     }
 
-    fn seek(_x: int, _s: io::seek_style) {
+    fn seek(_x: int, _s: io::SeekStyle) {
         fail;
     }
     fn tell() -> uint {
@@ -218,8 +218,8 @@ impl &SipState : io::writer {
     fn flush() -> int {
         0
     }
-    fn get_type() -> io::writer_type {
-        io::file
+    fn get_type() -> io::WriterType {
+        io::File
     }
 }