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

Exclude crown from the root Cargo workspace (#34173)

Browse source 
* Exclude crown from workspace

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>

* Update shell.nix and remove filterlock

Signed-off-by: Delan Azabani <dazabani@igalia.com>

---------

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
Signed-off-by: Delan Azabani <dazabani@igalia.com>
Co-authored-by: Delan Azabani <dazabani@igalia.com>
This commit is contained in:
Samson 2024-11-08 11:08:49 +01:00 • committed by GitHub
parent ac5c67849e
commit 39ef61c324
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 693 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

18
python/servo/testing_commands.py
View file

@ -75,6 +75,16 @@ def format_toml_files_with_taplo(check_only: bool = True) -> int:
return call([taplo, "fmt", *TOML_GLOBS], env={'RUST_LOG': 'error'})
def format_with_rustfmt(check_only: bool = True) -> int:
maybe_check_only = ["--check"] if check_only else []
result = call(["cargo", "fmt", "--", *UNSTABLE_RUSTFMT_ARGUMENTS, *maybe_check_only])
if result != 0:
return result
return call(["cargo", "fmt", "--manifest-path", "support/crown/Cargo.toml",
"--", *UNSTABLE_RUSTFMT_ARGUMENTS, *maybe_check_only])
@CommandProvider
class MachCommands(CommandBase):
DEFAULT_RENDER_MODE = "cpu"
@ -153,7 +163,6 @@ class MachCommands(CommandBase):
"base",
"compositing",
"constellation",
"crown",
"fonts",
"hyper_serde",
"layout_2013",
@ -205,6 +214,9 @@ class MachCommands(CommandBase):
args += ["--", "--nocapture"]
env = self.build_env()
result = call(["cargo", "bench" if bench else "test"], cwd="support/crown")
if result != 0:
return result
return self.run_cargo_build_like_command(
"bench" if bench else "test",
args,
@ -231,7 +243,7 @@ class MachCommands(CommandBase):
tidy_failed = tidy.scan(not all_files, not no_progress)
print("\r ➤ Checking formatting of Rust files...")
rustfmt_failed = call(["cargo", "fmt", "--", *UNSTABLE_RUSTFMT_ARGUMENTS, "--check"])
rustfmt_failed = format_with_rustfmt(check_only=True)
if rustfmt_failed:
print("Run `./mach fmt` to fix the formatting")
@ -344,7 +356,7 @@ class MachCommands(CommandBase):
if result != 0:
return result
return call(["cargo", "fmt", "--", *UNSTABLE_RUSTFMT_ARGUMENTS])
return format_with_rustfmt(check_only=False)
@Command('update-wpt',
description='Update the web platform tests',