---

Manishearth · Manishearth · commit 2dd57f477fcf · 2016-03-27T12:31:35.000+05:30
yaml --- r: 271660 b: refs/heads/master c: a3fdf32 h: refs/heads/master
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 157ba0038dea24f06d594b6e1190fcd0eb431018
+refs/heads/master: a3fdf327e8bda2aaafd597f09c25b2192bb4a287
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/trunk/src/librustc/ty/mod.rs b/trunk/src/librustc/ty/mod.rs
@@ -1342,7 +1342,7 @@ impl<'a, 'tcx> ParameterEnvironment<'a, 'tcx> {
                     }
                     _ => {
                         cx.sess.span_bug(item.span,
-                                         "ParameterEnvironment::from_item():
+                                         "ParameterEnvironment::for_item():
                                           can't create a parameter \
                                           environment for this kind of item")
                     }
@@ -1353,7 +1353,7 @@ impl<'a, 'tcx> ParameterEnvironment<'a, 'tcx> {
                 ParameterEnvironment::for_item(cx, cx.map.get_parent(id))
             }
             _ => {
-                cx.sess.bug(&format!("ParameterEnvironment::from_item(): \
+                cx.sess.bug(&format!("ParameterEnvironment::for_item(): \
                                      `{}` is not an item",
                                     cx.map.node_to_string(id)))
             }

Original file line number	Diff line number	Diff line change
`@@ -1342,7 +1342,7 @@ impl<'a, 'tcx> ParameterEnvironment<'a, 'tcx> {`
`1342`	`1342`	`}`
`1343`	`1343`	`_ => {`
`1344`	`1344`	`cx.sess.span_bug(item.span,`
`1345`		`- "ParameterEnvironment::from_item():`
	`1345`	`+ "ParameterEnvironment::for_item():`
`1346`	`1346`	`can't create a parameter \`
`1347`	`1347`	`environment for this kind of item")`
`1348`	`1348`	`}`
`@@ -1353,7 +1353,7 @@ impl<'a, 'tcx> ParameterEnvironment<'a, 'tcx> {`
`1353`	`1353`	`ParameterEnvironment::for_item(cx, cx.map.get_parent(id))`
`1354`	`1354`	`}`
`1355`	`1355`	`_ => {`
`1356`		`- cx.sess.bug(&format!("ParameterEnvironment::from_item(): \`
	`1356`	`+ cx.sess.bug(&format!("ParameterEnvironment::for_item(): \`
`1357`	`1357`	`{}` is not an item",
`1358`	`1358`	`cx.map.node_to_string(id)))`
`1359`	`1359`	`}`