rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-clippy-warning

This commit is contained in:
sheshnath 2024-08-21 17:35:30 +05:30 committed by GitHub
parent 444c6a5b81 dbeba45b36
commit 2da8c1fe90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/src/error.rs
View File

@ -195,7 +195,7 @@ impl Error {
match result { match result {
Ok(_) => process::ExitCode::SUCCESS, Ok(_) => process::ExitCode::SUCCESS,
Err(e) => { Err(e) => {
span_error!("error", "aborting launch due to error" => e.trace_error()); span_error!("launch failure", "aborting launch due to error" => e.trace_error());
process::ExitCode::SUCCESS process::ExitCode::SUCCESS
} }
} }

2
core/lib/src/trace/traceable.rs
View File

@ -338,7 +338,7 @@ impl Trace for ErrorKind {
}); });
} }
FailedFairings(fairings) => { FailedFairings(fairings) => {
let span = span!(level, "fairings", count = fairings.len(), "ignition failure"); let span = span!(level, "failed ignite fairings", count = fairings.len());
span.in_scope(|| fairings.iter().trace_all(level)); span.in_scope(|| fairings.iter().trace_all(level));
}, },
SentinelAborts(sentries) => { SentinelAborts(sentries) => {

2
testbench/src/servers/ignite_failure.rs
View File

@ -7,7 +7,7 @@ fn test_ignite_failure() -> Result<()> {
}; };
if let Err(Error::Liftoff(stdout, _)) = server { if let Err(Error::Liftoff(stdout, _)) = server {
assert!(stdout.contains("ignition failure")); assert!(stdout.contains("failed ignite"));
assert!(stdout.contains("FailNow")); assert!(stdout.contains("FailNow"));
} else { } else {
panic!("unexpected result: {server:#?}"); panic!("unexpected result: {server:#?}");