---

AlisdairO · AlisdairO · commit 46542b37210b · 2015-07-18T20:46:47.000+01:00
yaml --- r: 228495 b: refs/heads/try c: 44f29fb h: refs/heads/master i: 228493: 29b6fef 228491: 8656e46 228487: f9c7044 228479: 104f53a v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 56b450b2912d1fe1f2c88d05e79f85f78ff2ec98
+refs/heads/try: 44f29fbdbc5edf067c272851d38e32a747613597
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try/src/librustc_resolve/diagnostics.rs b/branches/try/src/librustc_resolve/diagnostics.rs
@@ -100,10 +100,10 @@ trying to import a function from a trait. An example of this error:
 ```
 mod foo {
     pub trait MyTrait {
-        fn doSomething();
+        fn do_something();
     }
 }
-use foo::MyTrait::doSomething;
+use foo::MyTrait::do_something;
 ```
 
 In general, it's not legal to directly import methods belonging to a

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,10 @@ trying to import a function from a trait. An example of this error:`
`100`	`100`	```
`101`	`101`	`mod foo {`
`102`	`102`	`pub trait MyTrait {`
`103`		`- fn doSomething();`
	`103`	`+ fn do_something();`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-use foo::MyTrait::doSomething;`
	`106`	`+use foo::MyTrait::do_something;`
`107`	`107`	```
`108`	`108`
`109`	`109`	`In general, it's not legal to directly import methods belonging to a`