bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Replace spaghetti with a simple errors enum

Browse source
This commit is contained in:
Adrian Tombu 2022-08-25 18:05:23 +02:00
parent 3f883b850d
commit bf7ce6a1a6
No known key found for this signature in database
GPG key ID: 9CD8E979D3A943FE
7 changed files with 65 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

33
compiler/rustc_codegen_ssa/src/lib.rs
View file

@ -21,7 +21,6 @@ extern crate tracing;
#[macro_use]
extern crate rustc_middle;
use crate::session_diagnostic::{DeserializeRlinkError, DeserializeRlinkErrorSub};
use rustc_ast as ast;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_data_structures::sync::Lrc;
@ -50,7 +49,6 @@ pub mod glue;
pub mod meth;
pub mod mir;
pub mod mono_item;
pub mod session_diagnostic;
pub mod target_features;
pub mod traits;
@ -170,6 +168,13 @@ pub struct CodegenResults {
pub crate_info: CrateInfo,
}
pub enum CodegenErrors {
WrongFileType,
EmptyVersionNumber,
EncodingVersionMismatch { version_array: String, rlink_version: String },
RustcVersionMismatch { rustc_version: String, current_version: String },
}
pub fn provide(providers: &mut Providers) {
crate::back::symbol_export::provide(providers);
crate::base::provide(providers);
@ -214,27 +219,23 @@ impl CodegenResults {
encoder.finish()
}
pub fn deserialize_rlink(data: Vec<u8>) -> Result<Self, DeserializeRlinkError> {
pub fn deserialize_rlink(data: Vec<u8>) -> Result<Self, CodegenErrors> {
// The Decodable machinery is not used here because it panics if the input data is invalid
// and because its internal representation may change.
if !data.starts_with(RLINK_MAGIC) {
return Err(DeserializeRlinkError { sub: DeserializeRlinkErrorSub::WrongFileType });
return Err(CodegenErrors::WrongFileType);
}
let data = &data[RLINK_MAGIC.len()..];
if data.len() < 4 {
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::EmptyVersionNumber,
});
return Err(CodegenErrors::EmptyVersionNumber);
}
let mut version_array: [u8; 4] = Default::default();
version_array.copy_from_slice(&data[..4]);
if u32::from_be_bytes(version_array) != RLINK_VERSION {
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::EncodingVersionMismatch {
version_array: String::from_utf8_lossy(&version_array).to_string(),
rlink_version: RLINK_VERSION.to_string(),
},
return Err(CodegenErrors::EncodingVersionMismatch {
version_array: String::from_utf8_lossy(&version_array).to_string(),
rlink_version: RLINK_VERSION.to_string(),
});
}
@ -242,11 +243,9 @@ impl CodegenResults {
let rustc_version = decoder.read_str();
let current_version = RUSTC_VERSION.unwrap();
if rustc_version != current_version {
return Err(DeserializeRlinkError {
sub: DeserializeRlinkErrorSub::RustcVersionMismatch {
rustc_version: rustc_version.to_string(),
current_version: current_version.to_string(),
},
return Err(CodegenErrors::RustcVersionMismatch {
rustc_version: rustc_version.to_string(),
current_version: current_version.to_string(),
});
}