Skip to content

rustfmt: Use edition form Cargo.toml rather than always 2015 (DO NOT MERGE) #5232

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

Closed
nickbp wants to merge 2 commits into from
Closed

rustfmt: Use edition form Cargo.toml rather than always 2015 (DO NOT MERGE) #5232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b248a8
`rustfmt`: Use `edition` form `Cargo.toml` rather than always `2015` …
nickbp Feb 20, 2022
5dcaf66
Build fixes
nickbp Feb 20, 2022
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
18 changes: 14 additions & 4 deletions src/bin/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ fn execute(opts: &Options) -> Result<i32> {
let file = PathBuf::from(path);
let file = file.canonicalize().unwrap_or(file);

let (config, _) = load_config(Some(file.parent().unwrap()), Some(options))?;
let (config, _, _) = load_config(Some(file.parent().unwrap()), Some(options))?;
let toml = config.all_options().to_toml()?;
io::stdout().write_all(toml.as_bytes())?;

Expand All @@ -248,7 +248,7 @@ fn execute(opts: &Options) -> Result<i32> {

fn format_string(input: String, options: GetOptsOptions) -> Result<i32> {
// try to read config from local directory
let (mut config, _) = load_config(Some(Path::new(".")), Some(options.clone()))?;
let (mut config, _, _) = load_config(Some(Path::new(".")), Some(options.clone()))?;

if options.check {
config.set().emit_mode(EmitMode::Diff);
Expand Down Expand Up @@ -294,12 +294,15 @@ fn format(
options: &GetOptsOptions,
) -> Result<i32> {
options.verify_file_lines(&files);
let (config, config_path) = load_config(None, Some(options.clone()))?;
let (config, config_path, cargo_path) = load_config(None, Some(options.clone()))?;

if config.verbose() == Verbosity::Verbose {
if let Some(path) = config_path.as_ref() {
println!("Using rustfmt config file {}", path.display());
}
if let Some(path) = cargo_path.as_ref() {
println!("Using cargo config file {}", path.display());
}
}

let out = &mut stdout();
Expand All @@ -315,7 +318,7 @@ fn format(
} else {
// Check the file directory if the config-path could not be read or not provided
if config_path.is_none() {
let (local_config, config_path) =
let (local_config, config_path, cargo_path) =
load_config(Some(file.parent().unwrap()), Some(options.clone()))?;
if local_config.verbose() == Verbosity::Verbose {
if let Some(path) = config_path {
Expand All @@ -325,6 +328,13 @@ fn format(
file.display()
);
}
if let Some(path) = cargo_path {
println!(
"Using cargo config file {} for {}",
path.display(),
file.display()
);
}
}

session.override_config(local_config, |sess| {
Expand Down
Loading