Fix clippy and formatting

.travis.yml

@@ -43,8 +43,10 @@ matrix:
     - name: "clippy"
       install: true
       rust: nightly
-      before_script: rustup component add clippy-preview
-      script: cargo clippy -- -D clippy::pedantic
+      script: |
+        if rustup component add clippy-preview ; then
+            cargo clippy -- -D clippy::pedantic
+        fi
 
 script:
   - cargo test

src/lib.rs

@@ -394,7 +394,7 @@ impl TestGenerator {
     ///     c.replace("FOO", "foo")
     /// });
     pub fn const_cname<F>(&mut self, f: F) -> &mut Self
-        where
+    where
         F: Fn(&str) -> String + 'static,
     {
         self.const_cname = Box::new(f);
@@ -1285,6 +1285,7 @@ impl<'a> Generator<'a> {
         cty
     }
 
+    #[clippy::allow(clippy::similar_names)]
     fn test_const(&mut self, name: &str, rust_ty: &str) {
         if (self.opts.skip_const)(name) {
             return;
@@ -1349,7 +1350,6 @@ impl<'a> Generator<'a> {
             "#,
                 ty = rust_ty,
                 name = name
-
             ));
         }
         self.tests.push(format!("const_{}", name));

testcrate/build.rs

@@ -60,6 +60,4 @@ fn main() {
             t => t.to_string(),
         })
         .generate("src/t2.rs", "t2gen_cxx.rs");
-
-
 }

testcrate/tests/all.rs

@@ -112,7 +112,6 @@ fn t2_cxx() {
     }
 }
 
-
 fn output(cmd: &mut Command) -> (String, ExitStatus) {
     let output = cmd.output().unwrap();
     let stdout = String::from_utf8(output.stdout).unwrap();