Auto merge of rust-lang#924 - fitzgen:rename-named-to-ty-param, r=fitzgen

Rename `TypeKind::Named` to `TypeKind::TypeParam`

Also renames a bunch of other things referring to named types to refer to type parameters.

Fixes rust-lang#915

Author: bors-servo

build.rs

@@ -16,9 +16,10 @@ mod codegen {
         println!("cargo:rerun-if-changed=src/codegen/helpers.rs");
         println!("cargo:rerun-if-changed=src/codegen/struct_layout.rs");
 
-        let mut dst =
-            File::create(Path::new(&out_dir).join("host-target.txt")).unwrap();
-        dst.write_all(env::var("TARGET").unwrap().as_bytes()).unwrap();
+        let mut dst = File::create(Path::new(&out_dir).join("host-target.txt"))
+            .unwrap();
+        dst.write_all(env::var("TARGET").unwrap().as_bytes())
+            .unwrap();
     }
 }
 
@@ -32,9 +33,11 @@ mod testgen {
 
     pub fn main() {
         let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-        let mut dst = File::create(Path::new(&out_dir).join("tests.rs")).unwrap();
+        let mut dst = File::create(Path::new(&out_dir).join("tests.rs"))
+            .unwrap();
 
-        let manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+        let manifest_dir =
+            PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
         let headers_dir = manifest_dir.join("tests").join("headers");
 
         let headers = match fs::read_dir(headers_dir) {
@@ -51,12 +54,19 @@ mod testgen {
         for entry in entries {
             match entry.path().extension().and_then(OsStr::to_str) {
                 Some("h") | Some("hpp") => {
-                    let func = entry.file_name().to_str().unwrap()
+                    let func = entry
+                        .file_name()
+                        .to_str()
+                        .unwrap()
                         .replace(|c| !char::is_alphanumeric(c), "_")
                         .replace("__", "_")
                         .to_lowercase();
-                    writeln!(dst, "test_header!(header_{}, {:?});",
-                             func, entry.path()).unwrap();
+                    writeln!(
+                        dst,
+                        "test_header!(header_{}, {:?});",
+                        func,
+                        entry.path()
+                    ).unwrap();
                 }
                 _ => {}
             }

src/callbacks.rs

@@ -8,7 +8,6 @@ use std::panic::UnwindSafe;
 /// A trait to allow configuring different kinds of types in different
 /// situations.
 pub trait ParseCallbacks: fmt::Debug + UnwindSafe {
-
     /// This function will be run on every macro that is identified
     fn parsed_macro(&self, _name: &str) {}
 
@@ -21,11 +20,12 @@ pub trait ParseCallbacks: fmt::Debug + UnwindSafe {
     /// This function should return whether, given the a given enum variant
     /// name, and value, returns whether this enum variant will forcibly be a
     /// constant.
-    fn enum_variant_behavior(&self,
-                             _enum_name: Option<&str>,
-                             _variant_name: &str,
-                             _variant_value: EnumVariantValue)
-                             -> Option<EnumVariantCustomBehavior> {
+    fn enum_variant_behavior(
+        &self,
+        _enum_name: Option<&str>,
+        _variant_name: &str,
+        _variant_value: EnumVariantValue,
+    ) -> Option<EnumVariantCustomBehavior> {
         None
     }
 }