Skip to content

fix(panic): fix panic in code and replace with error when appropriate #2008

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
NobodyXu merged 2 commits into from
Oct 11, 2026
Merged

fix(panic): fix panic in code and replace with error when appropriate #2008

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa751e0
fix(panic): fix panic in code and replace with error when appropriate
NobodyXu Oct 11, 2026
517fe28
Fix formatting and indentation in lib.rs
NobodyXu Oct 11, 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
38 changes: 28 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,15 +2142,20 @@ impl Build {
if libtst && libdir.is_dir() {
self.cargo_output.print_metadata(&format_args!(
"cargo:rustc-link-search=native={}",
libdir.to_str().unwrap()
libdir.display()
));
}

// And now the -l flag.
let lib = match cudart {
"shared" => "cudart",
"static" => "cudart_static",
bad => panic!("unsupported cudart option: {}", bad),
bad => {
return Err(Error::new(
ErrorKind::InvalidArgument,
format!("unsupported cudart option: {bad}"),
));
}
};
self.cargo_output
.print_metadata(&format_args!("cargo:rustc-link-lib={lib}"));
Expand Down Expand Up @@ -2434,10 +2439,12 @@ impl Build {
let mut cmd = compiler.to_command();
cmd.arg("-E");

assert!(
self.files.len() <= 1,
"Expand may only be called for a single file"
);
if self.files.len() > 1 {
return Err(Error::new(
ErrorKind::InvalidArgument,
"Expand may only be called for a single file",
));
}

let is_asm = self
.files
Expand Down Expand Up @@ -4144,8 +4151,11 @@ impl Build {
"buildcache",
"kache",
];
if let Some(custom_wrapper) = self.get_env("CC_KNOWN_WRAPPER_CUSTOM") {
known_wrappers.push(custom_wrapper.to_str().unwrap());
if let Some(custom_wrapper) = self
.get_env("CC_KNOWN_WRAPPER_CUSTOM")
.and_then(|v| v.to_str())
{
known_wrappers.push(custom_wrapper);
}

let mut parts = tool.split_whitespace();
Expand Down Expand Up @@ -5074,9 +5084,17 @@ impl Build {
return Some(deployment_target_ver);
}

let mut deployment_target = deployment_target_ver
let Ok(parts) = deployment_target_ver
.split('.')
.map(|v| v.parse::<u32>().expect("integer version"));
.map(str::parse::<u32>)
.collect::<Result<Vec<_>, _>>()
else {
self.cargo_output.print_warning(&format_args!(
"ignoring invalid deployment target {deployment_target_ver:?}"
));
return None;
};
let mut deployment_target = parts.into_iter();

match target.os {
"macos" => {
Expand Down
Loading