Skip to content

Update rustfmt command line interface #4006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 12, 2020
Merged

Update rustfmt command line interface #4006

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ad950b0
Bump version
topecongiro Jan 8, 2020
af0ae9b
Remove skip_children
topecongiro Jan 8, 2020
0310620
Remove unused getopts error from format-diff
topecongiro Jan 8, 2020
0bd06bd
Replace getopts with structopt in git-rustfmt
topecongiro Jan 8, 2020
4201852
Add error detail to FileLinesError::CannotCanonicalize
topecongiro Jan 8, 2020
2bfbd61
Take self reference intead of its ownership
topecongiro Jan 8, 2020
25dd895
Do not dump emit_mode
topecongiro Jan 8, 2020
ca605ba
Change the behavior of Config::used_option
topecongiro Jan 8, 2020
ea95e94
Update test
topecongiro Jan 8, 2020
c9cf7ad
Replace getotps with sturctopt in rustfmt
topecongiro Jan 8, 2020
e255052
Upate Cargo.toml
topecongiro Jan 8, 2020
265697c
Update Cargo.lock
topecongiro Jan 8, 2020
d961464
Update rustfmt-core/rustfmt-bin/src/bin/main.rs
topecongiro Jan 11, 2020
f73785c
Update rustfmt-core/rustfmt-bin/src/bin/main.rs
topecongiro Jan 11, 2020
6e5e6df
Remove skip_children
topecongiro Jan 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions rustfmt-core/rustfmt-bin/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ fn main() {
}

println!("cargo:rerun-if-env-changed=CFG_RELEASE_CHANNEL");
if option_env!("CFG_RELEASE_CHANNEL").map_or(true, |c| c == "nightly" || c == "dev") {
println!("cargo:rustc-cfg=nightly");
}

let out_dir = PathBuf::from(env::var_os("OUT_DIR").unwrap());

File::create(out_dir.join("commit-info.txt"))
File::create(out_dir.join("version-info.txt"))
.unwrap()
.write_all(commit_info().as_bytes())
.unwrap();
Expand All @@ -25,7 +28,10 @@ fn main() {
// (git not installed or if this is not a git repository) just return an empty string.
fn commit_info() -> String {
match (channel(), commit_hash(), commit_date()) {
(channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash.trim_end(), date),
(channel, Some(hash), Some(date)) => {
format!("{}-{} ({} {})", option_env!("CARGO_PKG_VERSION")
.unwrap_or("unknown"), channel, hash.trim_end(), date)
},
_ => String::new(),
}
}
Expand Down
Loading