---

erickt · erickt · commit 48544e29024c · 2012-08-22T19:10:28.000-07:00
yaml --- r: 27978 b: refs/heads/try c: cfa71a1 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 4ef1d9d5b538ffb896cb37485b24dd029a6832de
+refs/heads/try: cfa71a135b2dfd5c5294737e392bb3b22929d940
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/rustc/driver/driver.rs b/branches/try/src/rustc/driver/driver.rs
@@ -583,8 +583,9 @@ fn parse_pretty(sess: session, &&name: ~str) -> pp_mode {
       ~"expanded,identified" => ppm_expanded_identified,
       ~"identified" => ppm_identified,
       _ => {
-        sess.fatal(~"argument to `pretty` must be one of `normal`, `typed`, \
-                     or `identified`");
+        sess.fatal(~"argument to `pretty` must be one of `normal`, \
+                     `expanded`, `typed`, `identified`, \
+                     or `expanded,identified`");
       }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -583,8 +583,9 @@ fn parse_pretty(sess: session, &&name: ~str) -> pp_mode {`
`583`	`583`	`~"expanded,identified" => ppm_expanded_identified,`
`584`	`584`	`~"identified" => ppm_identified,`
`585`	`585`	`_ => {`
`586`		- sess.fatal(~"argument to `pretty` must be one of `normal`, `typed`, \
`587`		- or `identified`");
	`586`	+ sess.fatal(~"argument to `pretty` must be one of `normal`, \
	`587`	+ `expanded`, `typed`, `identified`, \
	`588`	+ or `expanded,identified`");
`588`	`589`	`}`
`589`	`590`	`}`
`590`	`591`	`}`