Skip to content

Eliminate use of ctor #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smoelius merged 3 commits into from
May 12, 2026
Merged

Eliminate use of ctor #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33646f8
Eliminate use of `ctor`
smoelius May 12, 2026
bba4726
Use `unset`
smoelius May 12, 2026
1e3239c
Eliminate useless borrow
smoelius May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
rustup +nightly component add clippy
cargo install cargo-dylint dylint-link || true
cargo install cargo-supply-chain || true
cargo install group-runner || true
cargo install unset || true

- name: Update
if: ${{ runner.os == 'Linux' }}
Expand All @@ -83,7 +83,7 @@ jobs:
run: cargo test --no-run

- name: Test
run: cargo test --config "target.'cfg(all())'.runner = 'group-runner'"
run: cargo test --config "target.'cfg(all())'.runner = 'unset'"

all-checks:
needs: [test]
Expand Down
23 changes: 0 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ xdg = "3.0"
[dev-dependencies]
assert_cmd = "2.2"
cargo_metadata = "0.23"
ctor = "0.12"
serde = "1.0"
serde_json = "1.0"
similar-asserts = "2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/util/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ pub fn split_and_expand(build_script_path: &Path) -> Result<Vec<String>> {
.into_iter()
.map(|arg| expand(&arg, Some(build_script_path)))
.collect::<Result<Vec<_>>>()?;
eprintln!("expanded `BUILD_WRAP_CMD`: {:#?}", &expanded_args);
eprintln!("expanded `BUILD_WRAP_CMD`: {expanded_args:#?}");
ensure!(
!expanded_args.is_empty(),
"expanded `BUILD_WRAP_CMD` is empty or all whitespace"
Expand Down
7 changes: 0 additions & 7 deletions tests/integration/util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ use std::{
mod main_util;
pub use main_util::*;

#[ctor::ctor]
fn initialize() {
unsafe {
env::set_var("CARGO_TERM_COLOR", "never");
}
}

#[must_use]
pub fn build_with_build_wrap() -> Command {
let build_wrap = env!("CARGO_BIN_EXE_build-wrap");
Expand Down
1 change: 1 addition & 0 deletions unset.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CARGO_TERM_COLOR