Repository: brendanzab/gl-rs (language: rust)

Issue:
Fixed snake case warnings



Discussion / hints:
Done!

Could you squash the commits?

Squashed

Could you see if you could update the sax submodule? Travis seems to be annoyed.

It seems to be updated on my computer. I deleted the 'sax-rs' folder and did a new `git clone` and then did `git pull origin master`. Also did a `git submodule sync` in the 'gl-rs' directory. Still, no new commit number shows up in my Github app window.

Is there are command I can use?

Ack, I think we might need to change:

``` make
examples-deps: submodule-update
# ...
gen-deps: submodule-update
```

to:

``` make
examples-deps:
# ...
gen-deps:
```

The submodule update is probably reverting your git pull (stupid submodules)

Updated the makefile


Fix patch:
diff --git a/Makefile b/Makefile
index 6f72a051..89039ff4 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ doc:
 examples-dir:
 	mkdir -p $(EXAMPLES_DIR)
 
-examples-deps: submodule-update
+examples-deps:
 	make lib -C $(DEPS_DIR)/glfw-rs
 
 $(EXAMPLE_FILES): lib examples-dir examples-deps
@@ -72,7 +72,7 @@ $(EXAMPLE_FILES): lib examples-dir examples-deps
 
 examples: $(EXAMPLE_FILES)
 
-gen-deps: submodule-update
+gen-deps:
 	make lib -C $(DEPS_DIR)/sax-rs
 
 gen: gen-deps
@@ -96,6 +96,7 @@ clean:
 
 .PHONY: \
 	all \
+	submodule-update \
 	lib \
 	check \
 	doc \
diff --git a/deps/sax-rs b/deps/sax-rs
index cfe13e1c..a5ae75fa 160000
--- a/deps/sax-rs
+++ b/deps/sax-rs
@@ -1,1 +1,1 @@
-Subproject commit cfe13e1ca30c36369a0b75c85e10398e1bcab28c
+Subproject commit a5ae75fa386534226c8c3082c607b696c2c30382
diff --git a/src/gen/main.rs b/src/gen/main.rs
index c6b0e1ee..d965ac2e 100644
--- a/src/gen/main.rs
+++ b/src/gen/main.rs
@@ -94,7 +94,7 @@ fn main() {
 
     let reg = Registry::from_xml(
         File::open(&path).ok()
-            .expect(format!("Could not read {}", path.display()))
+            .expect(format!("Could not read {}", path.display()).as_slice())
             .read_to_str().ok()
             .expect( "registry source not utf8!" ).as_slice(), ns, filter
     );
@@ -249,6 +249,7 @@ impl<'a, W: Writer> Generator<'a, W> {
         self.write_line("#![feature(macro_rules)]");
         self.write_line("#![feature(globs)]");
         self.write_line("#![allow(non_camel_case_types)]");
+        self.write_line("#![allow(non_snake_case_functions)]");
         self.write_line("");
         self.write_line("extern crate libc;");
         self.write_line("");
diff --git a/src/gen/registry.rs b/src/gen/registry.rs
index dab69e56..8bbfa42c 100644
--- a/src/gen/registry.rs
+++ b/src/gen/registry.rs
@@ -17,7 +17,7 @@ extern crate sax;
 extern crate collections;
 
 use self::collections::TreeSet;
-use self::collections::HashSet;
+use std::collections::HashSet;
 use std::fmt;
 use std::from_str::FromStr;
 use std::slice::Items;


Test patch: