Merge pull request #2386 from acmcarther/master

topecongiro · web-flow · commit f925c581fe0c · 2018-01-26T12:35:52.000+09:00
Make rustfmt-bin's CARGO_PKG_VERSION envvar optional
diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs
@@ -387,7 +387,7 @@ fn print_usage_to_stdout(opts: &Options, reason: &str) {
 fn print_version() {
     println!(
         "{}-nightly{}",
-        env!("CARGO_PKG_VERSION"),
+        option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"),
         include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
     )
 }

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ fn print_usage_to_stdout(opts: &Options, reason: &str) {`
`387`	`387`	`fn print_version() {`
`388`	`388`	`println!(`
`389`	`389`	`"{}-nightly{}",`
`390`		`- env!("CARGO_PKG_VERSION"),`
	`390`	`+ option_env!("CARGO_PKG_VERSION").unwrap_or("unknown"),`
`391`	`391`	`include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))`
`392`	`392`	`)`
`393`	`393`	`}`