Skip to content

Commit

Permalink
Build fix and addressed feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
nyurik committed Sep 28, 2024
1 parent 340bd2a commit b2dd6a8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions compiler/rustc_codegen_gcc/build_system/src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ fn exec_command(
) -> Result<ExitStatus, String> {
let status = get_command_inner(input, cwd, env)
.spawn()
.map_err(|e| command_error(input, &cwd, e))?
.map_err(|e| command_error(input, cwd, e))?
.wait()
.map_err(|e| command_error(input, &cwd, e))?;
.map_err(|e| command_error(input, cwd, e))?;
#[cfg(unix)]
{
if let Some(signal) = status.signal() {
unsafe {
raise(signal as _);
}
// In case the signal didn't kill the current process.
return Err(command_error(input, &cwd, format!("Process received signal {}", signal)));
return Err(command_error(input, cwd, format!("Process received signal {}", signal)));
}
}
Ok(status)
Expand Down Expand Up @@ -112,7 +112,7 @@ pub fn run_command_with_env(
env: Option<&HashMap<String, String>>,
) -> Result<Output, String> {
let output =
get_command_inner(input, cwd, env).output().map_err(|e| command_error(input, &cwd, e))?;
get_command_inner(input, cwd, env).output().map_err(|e| command_error(input, cwd, e))?;
check_exit_status(input, cwd, output.status, Some(&output), true)?;
Ok(output)
}
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_session/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2092,8 +2092,8 @@ fn parse_assert_incr_state(
opt_assertion: Option<&str>,
) -> Option<IncrementalStateAssertion> {
match opt_assertion {
Some(s) if s == "loaded" => Some(IncrementalStateAssertion::Loaded),
Some(s) if s == "not-loaded" => Some(IncrementalStateAssertion::NotLoaded),
Some("loaded") => Some(IncrementalStateAssertion::Loaded),
Some("not-loaded") => Some(IncrementalStateAssertion::NotLoaded),
Some(s) => {
early_dcx.early_fatal(format!("unexpected incremental state assertion value: {s}"))
}
Expand Down

0 comments on commit b2dd6a8

Please sign in to comment.