Merge pull request #3587 from fitzgen/isle-exact-dep

cranelift-codegen: depend on an exact version of `isle`

Cargo.lock

@@ -539,10 +539,10 @@ dependencies = [
  "cranelift-codegen-meta",
  "cranelift-codegen-shared",
  "cranelift-entity",
+ "cranelift-isle",
  "criterion",
  "gimli",
  "hashbrown",
- "isle",
  "log",
  "miette",
  "regalloc",
@@ -625,6 +625,15 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "cranelift-isle"
+version = "0.78.0"
+dependencies = [
+ "log",
+ "miette",
+ "thiserror",
+]
+
 [[package]]
 name = "cranelift-jit"
 version = "0.78.0"
@@ -1420,21 +1429,12 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
 
-[[package]]
-name = "isle"
-version = "0.78.0"
-dependencies = [
- "log",
- "miette",
- "thiserror",
-]
-
 [[package]]
 name = "isle-fuzz"
 version = "0.0.0"
 dependencies = [
+ "cranelift-isle",
  "env_logger 0.9.0",
- "isle",
  "libfuzzer-sys",
  "log",
 ]
@@ -1443,8 +1443,8 @@ dependencies = [
 name = "islec"
 version = "0.1.0"
 dependencies = [
+ "cranelift-isle",
  "env_logger 0.8.3",
- "isle",
  "miette",
  "structopt",
 ]

cranelift/codegen/Cargo.toml

@@ -35,7 +35,7 @@ criterion = "0.3"
 
 [build-dependencies]
 cranelift-codegen-meta = { path = "meta", version = "0.78.0" }
-isle = { path = "../isle/isle", version = "0.78.0", optional = true }
+cranelift-isle = { path = "../isle/isle", version = "=0.78.0", optional = true }
 miette = { version = "3", features = ["fancy"], optional = true }
 sha2 = "0.9.8"
 
@@ -91,7 +91,7 @@ regalloc-snapshot = ["bincode", "regalloc/enable-serde"]
 souper-harvest = ["souper-ir", "souper-ir/stringify"]
 
 # Recompile ISLE DSL source files into their generated Rust code.
-rebuild-isle = ["isle", "miette", "cranelift-codegen-meta/rebuild-isle"]
+rebuild-isle = ["cranelift-isle", "miette", "cranelift-codegen-meta/rebuild-isle"]
 
 # A hack to skip the ISLE-rebuild logic when testing for determinism
 # with the "Meta deterministic check" CI job.

cranelift/codegen/build.rs

@@ -369,6 +369,8 @@ fn rebuild_isle(
     compilation: &IsleCompilation,
     manifest: &str,
 ) -> Result<(), Box<dyn std::error::Error + 'static>> {
+    use cranelift_isle as isle;
+
     // First, remove the manifest, if any; we will recreate it
     // below if the compilation is successful. Ignore error if no
     // manifest was present.

cranelift/isle/fuzz/Cargo.toml

@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 env_logger = { version = "0.9.0", default-features = false }
-isle = { path = "../isle" }
+cranelift-isle = { path = "../isle" }
 libfuzzer-sys = "0.4"
 log = "0.4.14"
 

cranelift/isle/isle/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["The Cranelift Project Developers"]
 description = "ISLE: Instruction Selection and Lowering Expressions. A domain-specific language for instruction selection in Cranelift."
 edition = "2018"
 license = "Apache-2.0 WITH LLVM-exception"
-name = "isle"
+name = "cranelift-isle"
 readme = "../README.md"
 repository = "https://github.com/bytecodealliance/wasmtime/tree/main/cranelift/isle"
 version = "0.78.0"

cranelift/isle/islec/Cargo.toml

@@ -7,7 +7,7 @@ license = "Apache-2.0 WITH LLVM-exception"
 publish = false
 
 [dependencies]
-isle = { version = "*", path = "../isle/" }
+cranelift-isle = { version = "*", path = "../isle/" }
 env_logger = { version = "0.8", default-features = false }
 miette = { version = "3.0.0", features = ["fancy"] }
 structopt = "0.3.23"

cranelift/isle/islec/src/main.rs

@@ -1,4 +1,4 @@
-use isle::{compile, lexer, parser};
+use cranelift_isle::{compile, lexer, parser};
 use miette::{Context, IntoDiagnostic, Result};
 use std::{
     fs,

scripts/publish.rs

@@ -18,7 +18,7 @@ use std::time::Duration;
 // note that this list must be topologically sorted by dependencies
 const CRATES_TO_PUBLISH: &[&str] = &[
     // cranelift
-    "isle",
+    "cranelift-isle",
     "cranelift-entity",
     "wasmtime-types",
     "cranelift-bforest",