@@ -4,7 +4,7 @@ toolchain := ""
44tool := " cargo"
55
66cargo := tool + (if toolchain != " " { " +" + toolchain } else { " " })
7- cargo_nightly := cargo + " +nightly"
7+ cargo_nightly := tool + " +nightly"
88cargo_hack := cargo + " hack"
99cargo_tarpaulin := cargo + " tarpaulin"
1010cargo_llvm_cov := cargo_nightly + " llvm-cov"
@@ -39,7 +39,13 @@ clippy_flags := if warnings_as_errors == "true" { "-- -D warnings" } else { "" }
3939force_prep := " false"
4040force_prep_flag := if force_prep == " true" { " --force" } else { " " }
4141
42- just := " just all_features=" + all_features + " all_targets=" + all_targets + " message_format=" + message_format + " target_tuple=" + target_tuple + " release=" + release + " workspace=" + workspace + " package=" + package + " warnings_as_errors=" + warnings_as_errors + " force_prep=" + force_prep
42+ open := if env (" CI" , " " ) == " " { " true" } else { " false" }
43+ open_flag := if open == " true" { " --open" } else { " " }
44+
45+ no_deps := if toolchain == " nightly" { " true" } else { " false" }
46+ no_deps_flag := if no_deps == " true" { " --no-deps" } else { " " }
47+
48+ just := " just all_features=" + all_features + " all_targets=" + all_targets + " message_format=" + message_format + " target_tuple=" + target_tuple + " release=" + release + " workspace=" + workspace + " package=" + package + " warnings_as_errors=" + warnings_as_errors + " force_prep=" + force_prep + " open=" + open + " no_deps=" + no_deps
4349
4450rustdoc_extra_flags := if toolchain == " nightly" { " --cfg docsrs" } else { " " }
4551
@@ -101,7 +107,7 @@ update *extra_args:
101107
102108# Run `cargo tarpaulin` to produce code coverage
103109@ tarpaulin * extra_args : (_run-tests cargo_tarpaulin " --target-dir target/tarpaulin-target" extra_args)
104- {{ if env ( ' CI' , ' ' ) == ' ' { " just _open-tarpaulin" } else { " " } }}
110+ {{ if open == " true" { " just _open-tarpaulin" } else { " " } }}
105111
106112[unix ]
107113@_ open-tarpaulin :
@@ -119,7 +125,7 @@ update *extra_args:
119125doc : _doc
120126
121127_ doc $ RUSTDOCFLAGS = (" -D warnings " + rustdoc_extra_flags):
122- {{ cargo}} doc {{ if env ( ' CI' , ' ' ) == ' ' { ' --open' } else { ' ' } }} {{ if toolchain == ' nightly' { ' --no-deps' } else { ' ' } }} {{ package_flag}} {{ all_features_flag}} {{ message_format_flag}}
128+ {{ cargo}} doc {{ open_flag }} {{ no_deps_flag }} {{ package_flag}} {{ all_features_flag}} {{ message_format_flag}}
123129
124130# Check doc coverage with Nightly rustdoc
125131doc-coverage : _doc-coverage
@@ -154,11 +160,11 @@ test-package *extra_args:
154160
155161# Run `cargo msrv-prep`
156162prep * extra_args :
157- {{ cargo }} msrv-prep {{ package_flag}} --backup-root-manifest {{ force_prep_flag}} {{ extra_args}}
163+ {{ cargo_nightly }} msrv-prep {{ package_flag}} --backup-root-manifest {{ force_prep_flag}} {{ extra_args}}
158164
159165# Run `cargo msrv-unprep`
160166unprep * extra_args :
161- {{ cargo }} msrv-unprep {{ package_flag}} --backup-root-manifest {{ extra_args}}
167+ {{ cargo_nightly }} msrv-unprep {{ package_flag}} --backup-root-manifest {{ extra_args}}
162168
163169# ----- Utilities -----
164170
0 commit comments