rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-23 06:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop redundant resolver setting for 2021 edition

Browse Source
This commit is contained in:
Kirill Bulatov
2022-04-20 16:24:33 +03:00
committed by Kirill Bulatov
parent 9d3779c124
commit 629688fd6c
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/hakari.toml
View File

@@ -10,6 +10,8 @@ dep-format-version = "2"
# Hakari works much better with the new feature resolver. # Hakari works much better with the new feature resolver.
# For more about the new feature resolver, see: # For more about the new feature resolver, see:
# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver # https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
# Have to keep the resolver still here since hakari requires this field,
# despite it's now the default for 2021 edition & cargo.
resolver = "2" resolver = "2"
# Add triples corresponding to platforms commonly used by developers here. # Add triples corresponding to platforms commonly used by developers here.

1
Cargo.toml
View File

@@ -11,7 +11,6 @@ members = [
"zenith_metrics", "zenith_metrics",
"zenith_utils", "zenith_utils",
] ]
resolver = "2"
[profile.release] [profile.release]
# This is useful for profiling and, to some extent, debug. # This is useful for profiling and, to some extent, debug.

2
pre-commit.py
View File

@@ -29,7 +29,7 @@ def colorify(
def rustfmt(fix_inplace: bool = False, no_color: bool = False) -> str: def rustfmt(fix_inplace: bool = False, no_color: bool = False) -> str:
cmd = "rustfmt --edition=2018" cmd = "rustfmt --edition=2021"
if not fix_inplace: if not fix_inplace:
cmd += " --check" cmd += " --check"
if no_color: if no_color: