tests/test-check-rust-format.t
author Martin von Zweigbergk <martinvonz@google.com>
Mon, 07 Feb 2022 22:54:38 -0800
changeset 48760 93d6f0e7ba2f
parent 48297 9ebc10ad4a04
child 48742 090346b095fb
permissions -rw-r--r--
filemerge: move check for identical sides out of filemerge() `filemerge.filemerge()` returns `None` if no merge was necessary because the two sides were identical. I don't think it should be that function's responsibility to handle that case; we should ideally not even call `filemerge.filemerge()` if the two inputs identical. This patch therefore moves the check out to the caller (`mergestate.py`). The largefiles test changed because we now notice that the two sides made the same change, so we don't consider it a merge. Also note that the new message better matches the line above it in the test output. Differential Revision: https://phab.mercurial-scm.org/D12154
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43819
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     1
#require rustfmt test-repo
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     2
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     3
  $ . "$TESTDIR/helpers-testrepo.sh"
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     4
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     5
  $ cd "$TESTDIR"/..
48297
9ebc10ad4a04 rust-format: update rustfmt version
Raphaël Gomès <rgomes@octobus.net>
parents: 45987
diff changeset
     6
  $ RUSTFMT=$(rustup which --toolchain nightly-2021-11-02 rustfmt)
43819
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     7
  $ for f in `testrepohg files 'glob:**/*.rs'` ; do
44732
f44a7d8660ea test-check-rust-format: specify --edition=2018
Yuya Nishihara <yuya@tcha.org>
parents: 43819
diff changeset
     8
  >   $RUSTFMT --check --edition=2018 --unstable-features --color=never $f
43819
e8a3bbffdc7d tests: add test for Rust formatting
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
     9
  > done