Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88909afe authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use canonical version of rustfmt" am: addd3f7f am: 6705aced 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1527919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib074a490deb02515c2c769a52923c3e2da0f0aed
parents 0106319f 6705aced

PREUPLOAD.cfg

+4 −1
Original line number Diff line number Diff line
@@ -3,8 +3,11 @@ ignore_merged_commits = true 


[Builtin Hooks]

clang_format = true

rustfmt = true



[Builtin Hooks Options]

rustfmt = --config-path=rustfmt.toml



[Hook Scripts]

aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ".*$"

yapf_hook = ./tools/scripts/yapf_checker.py

rustfmt.toml

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../build/soong/scripts/rustfmt.toml
 
 No newline at end of file

system/gd/rust/rustfmt.toml

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
edition = "2018"

#width_heuristics = "Max" uncomment out once main rustfmt supports this option

newline_style = "Unix"