Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-08 00:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run rustfmt on test-tidy

Browse source 
Add ./mach fmt command.
Mach installs rustfmt if needed.
This commit is contained in:
Pyfisch 2018-10-15 12:14:28 +02:00
parent 6878dbbbea
commit bf47f90da6
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
python/servo/devenv_commands.py
View file

@ -233,19 +233,6 @@ class MachCommands(CommandBase):
with cd(self.context.topdir): with cd(self.context.topdir):
return self.call_rustup_run(["cargo", "fetch"], env=self.build_env()) return self.call_rustup_run(["cargo", "fetch"], env=self.build_env())
@Command('rustfmt',
description='Format the Rust code using Cargo fmt',
category='devenv')
@CommandArgument(
'--directory', '-d', default=None,
help='Command-line argument to specify the directory for formatting')
def rustfmt(self, directory=""):
if directory == "":
directory = self.context.topdir
with cd(self.context.topdir):
return self.call_rustup_run(["cargo", "fmt", "--", directory], env=self.build_env())
@Command('ndk-stack', @Command('ndk-stack',
description='Invoke the ndk-stack tool with the expected symbol paths', description='Invoke the ndk-stack tool with the expected symbol paths',
category='devenv') category='devenv')

17
python/servo/testing_commands.py
View file

@ -304,6 +304,12 @@ class MachCommands(CommandBase):
"tests/wpt/mozilla/.") "tests/wpt/mozilla/.")
return 0 return 0
def install_rustfmt(self):
if self.call_rustup_run(["cargo", "fmt", "--version", "-q"],
stderr=open(os.devnull, "w")) != 0:
# Rustfmt is not installed. Install:
self.call_rustup_run(["rustup", "component", "add", "rustfmt-preview"])
@Command('test-tidy', @Command('test-tidy',
description='Run the source code tidiness check', description='Run the source code tidiness check',
category='testing') category='testing')
@ -322,7 +328,9 @@ class MachCommands(CommandBase):
else: else:
manifest_dirty = run_update(self.context.topdir, check_clean=True) manifest_dirty = run_update(self.context.topdir, check_clean=True)
tidy_failed = tidy.scan(not all_files, not no_progress, stylo=stylo) tidy_failed = tidy.scan(not all_files, not no_progress, stylo=stylo)
return tidy_failed or manifest_dirty self.install_rustfmt()
rustfmt_failed = self.call_rustup_run(["cargo", "fmt", "--", "--check"])
return tidy_failed or manifest_dirty or rustfmt_failed
@Command('test-webidl', @Command('test-webidl',
description='Run the WebIDL parser tests', description='Run the WebIDL parser tests',
@ -443,6 +451,13 @@ class MachCommands(CommandBase):
def update_manifest(self, **kwargs): def update_manifest(self, **kwargs):
return run_update(self.context.topdir, **kwargs) return run_update(self.context.topdir, **kwargs)
@Command('fmt',
description='Format the Rust source files with rustfmt',
category='testing')
def format_code(self, **kwargs):
self.install_rustfmt()
return self.call_rustup_run(["cargo", "fmt"])
@Command('update-wpt', @Command('update-wpt',
description='Update the web platform tests', description='Update the web platform tests',
category='testing', category='testing',