T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename lookup_variant to lookup

Browse Source
This commit is contained in:
bjorn3
2021-09-29 22:37:45 +02:00
parent 4b6d20d03f
commit 463a88e002
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cranelift/codegen/src/isa/mod.rs
View File

@@ -111,9 +111,9 @@ macro_rules! isa_builder {
}}; }};
} }
/// Look for an ISA for the given `triple`, selecting the backend variant given /// Look for an ISA for the given `triple`.
/// by `variant` if available. /// Return a builder that can create a corresponding `TargetIsa`.
pub fn lookup_variant(triple: Triple) -> Result<Builder, LookupError> { pub fn lookup(triple: Triple) -> Result<Builder, LookupError> {
match triple.architecture { match triple.architecture {
Architecture::X86_64 => { Architecture::X86_64 => {
isa_builder!(x64, (feature = "x86"), triple) isa_builder!(x64, (feature = "x86"), triple)
@@ -125,12 +125,6 @@ pub fn lookup_variant(triple: Triple) -> Result<Builder, LookupError> {
} }
} }
/// Look for an ISA for the given `triple`.
/// Return a builder that can create a corresponding `TargetIsa`.
pub fn lookup(triple: Triple) -> Result<Builder, LookupError> {
lookup_variant(triple)
}
/// Look for a supported ISA with the given `name`. /// Look for a supported ISA with the given `name`.
/// Return a builder that can create a corresponding `TargetIsa`. /// Return a builder that can create a corresponding `TargetIsa`.
pub fn lookup_by_name(name: &str) -> Result<Builder, LookupError> { pub fn lookup_by_name(name: &str) -> Result<Builder, LookupError> {

2
cranelift/native/src/lib.rs
View File

@@ -41,7 +41,7 @@ pub fn builder() -> Result<isa::Builder, &'static str> {
/// useful when more than oen backend exists for a given target /// useful when more than oen backend exists for a given target
/// (e.g., on x86-64). /// (e.g., on x86-64).
pub fn builder_with_options(infer_native_flags: bool) -> Result<isa::Builder, &'static str> { pub fn builder_with_options(infer_native_flags: bool) -> Result<isa::Builder, &'static str> {
let mut isa_builder = isa::lookup_variant(Triple::host()).map_err(|err| match err { let mut isa_builder = isa::lookup(Triple::host()).map_err(|err| match err {
isa::LookupError::SupportDisabled => "support for architecture disabled at compile time", isa::LookupError::SupportDisabled => "support for architecture disabled at compile time",
isa::LookupError::Unsupported => "unsupported architecture", isa::LookupError::Unsupported => "unsupported architecture",
})?; })?;

2
cranelift/reader/src/parser.rs
View File

@@ -1159,7 +1159,7 @@ impl<'a> Parser<'a> {
Ok(triple) => triple, Ok(triple) => triple,
Err(err) => return err!(loc, err), Err(err) => return err!(loc, err),
}; };
let mut isa_builder = match isa::lookup_variant(triple) { let mut isa_builder = match isa::lookup(triple) {
Err(isa::LookupError::SupportDisabled) => { Err(isa::LookupError::SupportDisabled) => {
continue; continue;
} }