Skip to content

Commit b2dd6a8

Browse files
committed
Build fix and addressed feedback
1 parent 340bd2a commit b2dd6a8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compiler/rustc_codegen_gcc/build_system/src/utils.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ fn exec_command(
2121
) -> Result<ExitStatus, String> {
2222
let status = get_command_inner(input, cwd, env)
2323
.spawn()
24-
.map_err(|e| command_error(input, &cwd, e))?
24+
.map_err(|e| command_error(input, cwd, e))?
2525
.wait()
26-
.map_err(|e| command_error(input, &cwd, e))?;
26+
.map_err(|e| command_error(input, cwd, e))?;
2727
#[cfg(unix)]
2828
{
2929
if let Some(signal) = status.signal() {
3030
unsafe {
3131
raise(signal as _);
3232
}
3333
// In case the signal didn't kill the current process.
34-
return Err(command_error(input, &cwd, format!("Process received signal {}", signal)));
34+
return Err(command_error(input, cwd, format!("Process received signal {}", signal)));
3535
}
3636
}
3737
Ok(status)
@@ -112,7 +112,7 @@ pub fn run_command_with_env(
112112
env: Option<&HashMap<String, String>>,
113113
) -> Result<Output, String> {
114114
let output =
115-
get_command_inner(input, cwd, env).output().map_err(|e| command_error(input, &cwd, e))?;
115+
get_command_inner(input, cwd, env).output().map_err(|e| command_error(input, cwd, e))?;
116116
check_exit_status(input, cwd, output.status, Some(&output), true)?;
117117
Ok(output)
118118
}

compiler/rustc_session/src/config.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2092,8 +2092,8 @@ fn parse_assert_incr_state(
20922092
opt_assertion: Option<&str>,
20932093
) -> Option<IncrementalStateAssertion> {
20942094
match opt_assertion {
2095-
Some(s) if s == "loaded" => Some(IncrementalStateAssertion::Loaded),
2096-
Some(s) if s == "not-loaded" => Some(IncrementalStateAssertion::NotLoaded),
2095+
Some("loaded") => Some(IncrementalStateAssertion::Loaded),
2096+
Some("not-loaded") => Some(IncrementalStateAssertion::NotLoaded),
20972097
Some(s) => {
20982098
early_dcx.early_fatal(format!("unexpected incremental state assertion value: {s}"))
20992099
}

0 commit comments

Comments
 (0)