---

AlisdairO · AlisdairO · commit f49b842869f5 · 2015-07-18T20:46:47.000+01:00
yaml --- r: 221075 b: refs/heads/tmp c: 44f29fb h: refs/heads/master i: 221073: e50ab0b 221071: f44cd0d v: v3
diff --git a/[refs] b/[refs]
@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: c8bab9d06a179028a0d5129aa62f09d694d9cc49
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 56b450b2912d1fe1f2c88d05e79f85f78ff2ec98
+refs/heads/tmp: 44f29fbdbc5edf067c272851d38e32a747613597
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e58601ab085591c71a27ae82137fc313222c2270
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
diff --git a/branches/tmp/src/librustc_resolve/diagnostics.rs b/branches/tmp/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`