diff --git a/.vscode/settings.json b/.vscode/settings.json index d65d79e3..8aeca7f8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,12 +21,6 @@ }, "editor.formatOnSave": true, }, - "rust-analyzer.rustfmt.extraArgs": [ - "--config", - "match_block_trailing_comma=true", // Remove when rustfmt2.0 is released https://github.com/rust-lang/rustfmt/issues/3380 - "--config", - "control_brace_style=ClosingNextLine" // Remove when `control_brace_style` becomes stable https://github.com/rust-lang/rustfmt/issues/3377 - ], "rust-analyzer.diagnostics.disabled": [ "missing-unsafe" // Remove when rust-analyzer bug fixes unsafe code on WASM JavaScript https://github.com/rust-analyzer/rust-analyzer/issues/5412 ], diff --git a/README.md b/README.md index 76cb80c3..023f3db5 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Graphite is an in-development desktop graphics editor that strives to be the most powerful, intuitive, and versatile tool for fully-nondestructive vector and raster editing. It is early in development but the UI and UX design is relatively complete and highly promising. The first release, Graphite 0.1, will focus on SVG editing. Then 0.2 will make that nondestructive with a node graph. Later revisions will provide full resolution-agnostic raster editing capabilities. -We need Rust and web developers! Feel free to peruse the [documentation](docs/index.md) and hop onto Discord to ask for where to start: +We need Rust and web developers! Feel free to peruse the [documentation](docs/index.md) and hop onto Discord to ask where to start: ## Discord diff --git a/rustfmt.toml b/rustfmt.toml index d8351ff1..0ec7f705 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,19 +1,13 @@ edition = "2018" hard_tabs = true -max_width = 180 +max_width = 200 newline_style = "Unix" use_try_shorthand = true -# Enable when 2.0 is released: -# match_block_trailing_comma = true - -# Enable when control_brace_style becomes stable: -# control_brace_style = "ClosingNextLine" - # Maybe enable these in the future when they're stabilized # normalize_comments = true # normalize_doc_attributes = true # struct_lit_width = 35 # where_single_line = true - -# For now run: cargo fmt -- --config match_block_trailing_comma=true --config control_brace_style=ClosingNextLine \ No newline at end of file +# match_block_trailing_comma = true # https://github.com/rust-lang/rustfmt/issues/3380 +# control_brace_style = "ClosingNextLine" # https://github.com/rust-lang/rustfmt/issues/3377