rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix long lines which rustfmt fails to format

Browse Source 
rustfmt fails to format this match expression, because it has several
long string literals over the maximum line width. This seems to exhibit
rustfmt issues #3863 (Gives up on chains if any line is too long) and
#3156 (Fail to format match arm when other arm has long line).
This commit is contained in:
Thalia Archibald
2025-02-05 12:28:53 -08:00
parent 6171d944ae
commit 593c88fc49
2 changed files with 46 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.example.toml
View File

@@ -323,7 +323,7 @@
#full-bootstrap = false #full-bootstrap = false
# Set the bootstrap/download cache path. It is useful when building rust # Set the bootstrap/download cache path. It is useful when building rust
# repeatedly in a CI invironment. # repeatedly in a CI environment.
#bootstrap-cache-path = /path/to/shared/cache #bootstrap-cache-path = /path/to/shared/cache
# Enable a build of the extended Rust tool set which is not only the compiler # Enable a build of the extended Rust tool set which is not only the compiler

151
library/std/src/sys/pal/uefi/os.rs
View File

@@ -17,111 +17,50 @@ pub fn errno() -> RawOsError {
pub fn error_string(errno: RawOsError) -> String { pub fn error_string(errno: RawOsError) -> String {
// Keep the List in Alphabetical Order // Keep the List in Alphabetical Order
// The Messages are taken from UEFI Specification Appendix D - Status Codes // The Messages are taken from UEFI Specification Appendix D - Status Codes
match r_efi::efi::Status::from_usize(errno) { #[rustfmt::skip]
Status::ABORTED => "The operation was aborted.".to_owned(), let msg = match r_efi::efi::Status::from_usize(errno) {
Status::ACCESS_DENIED => "Access was denied.".to_owned(), Status::ABORTED => "The operation was aborted.",
Status::ALREADY_STARTED => "The protocol has already been started.".to_owned(), Status::ACCESS_DENIED => "Access was denied.",
Status::BAD_BUFFER_SIZE => "The buffer was not the proper size for the request.".to_owned(), Status::ALREADY_STARTED => "The protocol has already been started.",
Status::BUFFER_TOO_SMALL => { Status::BAD_BUFFER_SIZE => "The buffer was not the proper size for the request.",
"The buffer is not large enough to hold the requested data. The required buffer size is returned in the appropriate parameter when this error occurs.".to_owned() Status::BUFFER_TOO_SMALL => "The buffer is not large enough to hold the requested data. The required buffer size is returned in the appropriate parameter when this error occurs.",
} Status::COMPROMISED_DATA => "The security status of the data is unknown or compromised and the data must be updated or replaced to restore a valid security status.",
Status::COMPROMISED_DATA => { Status::CONNECTION_FIN => "The receiving operation fails because the communication peer has closed the connection and there is no more data in the receive buffer of the instance.",
"The security status of the data is unknown or compromised and the data must be updated or replaced to restore a valid security status.".to_owned() Status::CONNECTION_REFUSED => "The receiving or transmission operation fails because this connection is refused.",
} Status::CONNECTION_RESET => "The connect fails because the connection is reset either by instance itself or the communication peer.",
Status::CONNECTION_FIN => { Status::CRC_ERROR => "A CRC error was detected.",
"The receiving operation fails because the communication peer has closed the connection and there is no more data in the receive buffer of the instance.".to_owned() Status::DEVICE_ERROR => "The physical device reported an error while attempting the operation.",
} Status::END_OF_FILE => "The end of the file was reached.",
Status::CONNECTION_REFUSED => { Status::END_OF_MEDIA => "Beginning or end of media was reached",
"The receiving or transmission operation fails because this connection is refused.".to_owned() Status::HOST_UNREACHABLE => "The remote host is not reachable.",
} Status::HTTP_ERROR => "A HTTP error occurred during the network operation.",
Status::CONNECTION_RESET => { Status::ICMP_ERROR => "An ICMP error occurred during the network operation.",
"The connect fails because the connection is reset either by instance itself or the communication peer.".to_owned() Status::INCOMPATIBLE_VERSION => "The function encountered an internal version that was incompatible with a version requested by the caller.",
} Status::INVALID_LANGUAGE => "The language specified was invalid.",
Status::CRC_ERROR => "A CRC error was detected.".to_owned(), Status::INVALID_PARAMETER => "A parameter was incorrect.",
Status::DEVICE_ERROR => "The physical device reported an error while attempting the operation.".to_owned() Status::IP_ADDRESS_CONFLICT => "There is an address conflict address allocation",
, Status::LOAD_ERROR => "The image failed to load.",
Status::END_OF_FILE => { Status::MEDIA_CHANGED => "The medium in the device has changed since the last access.",
"The end of the file was reached.".to_owned() Status::NETWORK_UNREACHABLE => "The network containing the remote host is not reachable.",
} Status::NO_MAPPING => "A mapping to a device does not exist.",
Status::END_OF_MEDIA => { Status::NO_MEDIA => "The device does not contain any medium to perform the operation.",
"Beginning or end of media was reached".to_owned() Status::NO_RESPONSE => "The server was not found or did not respond to the request.",
} Status::NOT_FOUND => "The item was not found.",
Status::HOST_UNREACHABLE => { Status::NOT_READY => "There is no data pending upon return.",
"The remote host is not reachable.".to_owned() Status::NOT_STARTED => "The protocol has not been started.",
} Status::OUT_OF_RESOURCES => "A resource has run out.",
Status::HTTP_ERROR => { Status::PROTOCOL_ERROR => "A protocol error occurred during the network operation.",
"A HTTP error occurred during the network operation.".to_owned() Status::PROTOCOL_UNREACHABLE => "An ICMP protocol unreachable error is received.",
} Status::SECURITY_VIOLATION => "The function was not performed due to a security violation.",
Status::ICMP_ERROR => { Status::TFTP_ERROR => "A TFTP error occurred during the network operation.",
"An ICMP error occurred during the network operation.".to_owned() Status::TIMEOUT => "The timeout time expired.",
} Status::UNSUPPORTED => "The operation is not supported.",
Status::INCOMPATIBLE_VERSION => { Status::VOLUME_FULL => "There is no more space on the file system.",
"The function encountered an internal version that was incompatible with a version requested by the caller.".to_owned() Status::VOLUME_CORRUPTED => "An inconstancy was detected on the file system causing the operating to fail.",
} Status::WRITE_PROTECTED => "The device cannot be written to.",
Status::INVALID_LANGUAGE => { _ => return format!("Status: {errno}"),
"The language specified was invalid.".to_owned() };
} msg.to_owned()
Status::INVALID_PARAMETER => {
"A parameter was incorrect.".to_owned()
}
Status::IP_ADDRESS_CONFLICT => {
"There is an address conflict address allocation".to_owned()
}
Status::LOAD_ERROR => {
"The image failed to load.".to_owned()
}
Status::MEDIA_CHANGED => {
"The medium in the device has changed since the last access.".to_owned()
}
Status::NETWORK_UNREACHABLE => {
"The network containing the remote host is not reachable.".to_owned()
}
Status::NO_MAPPING => {
"A mapping to a device does not exist.".to_owned()
}
Status::NO_MEDIA => {
"The device does not contain any medium to perform the operation.".to_owned()
}
Status::NO_RESPONSE => {
"The server was not found or did not respond to the request.".to_owned()
}
Status::NOT_FOUND => "The item was not found.".to_owned(),
Status::NOT_READY => {
"There is no data pending upon return.".to_owned()
}
Status::NOT_STARTED => {
"The protocol has not been started.".to_owned()
}
Status::OUT_OF_RESOURCES => {
"A resource has run out.".to_owned()
}
Status::PROTOCOL_ERROR => {
"A protocol error occurred during the network operation.".to_owned()
}
Status::PROTOCOL_UNREACHABLE => {
"An ICMP protocol unreachable error is received.".to_owned()
}
Status::SECURITY_VIOLATION => {
"The function was not performed due to a security violation.".to_owned()
}
Status::TFTP_ERROR => {
"A TFTP error occurred during the network operation.".to_owned()
}
Status::TIMEOUT => "The timeout time expired.".to_owned(),
Status::UNSUPPORTED => {
"The operation is not supported.".to_owned()
}
Status::VOLUME_FULL => {
"There is no more space on the file system.".to_owned()
}
Status::VOLUME_CORRUPTED => {
"An inconstancy was detected on the file system causing the operating to fail.".to_owned()
}
Status::WRITE_PROTECTED => {
"The device cannot be written to.".to_owned()
}
_ => format!("Status: {}", errno),
}
} }
pub fn getcwd() -> io::Result<PathBuf> { pub fn getcwd() -> io::Result<PathBuf> {
@@ -314,7 +253,7 @@ mod uefi_env {
let mut start = 0; let mut start = 0;
// UEFI Shell returns all keys seperated by NULL. // UEFI Shell returns all keys separated by NULL.
// End of string is denoted by two NULLs // End of string is denoted by two NULLs
for i in 0.. { for i in 0.. {
if unsafe { *val.add(i) } == 0 { if unsafe { *val.add(i) } == 0 {