From 9ad01d39822d92e268a428bd223a1e839fd655ac Mon Sep 17 00:00:00 2001 From: Jack Huey Date: Wed, 29 Apr 2020 23:05:37 -0400 Subject: [PATCH] Prepare release 0.10.0 --- Cargo.lock | 73 ++++++++++++++++++------------------ Cargo.toml | 42 +++++---------------- RELEASES.md | 7 ++-- chalk-derive/Cargo.toml | 8 ++-- chalk-derive/README.md | 3 ++ chalk-engine/Cargo.toml | 6 +-- chalk-engine/README.md | 6 +-- chalk-integration/Cargo.toml | 34 +++++------------ chalk-integration/README.md | 3 ++ chalk-ir/Cargo.toml | 16 ++------ chalk-ir/README.md | 3 ++ chalk-macros/Cargo.toml | 2 +- chalk-macros/README.md | 2 + chalk-parse/Cargo.toml | 8 ++-- chalk-parse/README.md | 2 + chalk-rust-ir/Cargo.toml | 23 ++++-------- chalk-rust-ir/README.md | 3 ++ chalk-solve/Cargo.toml | 28 ++++---------- chalk-solve/README.md | 3 ++ 19 files changed, 108 insertions(+), 164 deletions(-) create mode 100644 chalk-derive/README.md create mode 100644 chalk-integration/README.md create mode 100644 chalk-ir/README.md create mode 100644 chalk-rust-ir/README.md create mode 100644 chalk-solve/README.md diff --git a/Cargo.lock b/Cargo.lock index 75af0a34a43..5a33f6fbcdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,16 +147,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chalk" -version = "0.1.0" +version = "0.10.0" dependencies = [ - "chalk-derive 0.1.0", - "chalk-engine 0.9.0", - "chalk-integration 0.1.0", - "chalk-ir 0.1.0", - "chalk-macros 0.1.1", - "chalk-parse 0.1.0", - "chalk-rust-ir 0.1.0", - "chalk-solve 0.1.0", + "chalk-derive 0.10.0", + "chalk-engine 0.10.0", + "chalk-integration 0.10.0", + "chalk-ir 0.10.0", + "chalk-macros 0.10.0", + "chalk-parse 0.10.0", + "chalk-rust-ir 0.10.0", + "chalk-solve 0.10.0", "docopt 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -168,7 +168,7 @@ dependencies = [ [[package]] name = "chalk-derive" -version = "0.1.0" +version = "0.10.0" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -178,46 +178,47 @@ dependencies = [ [[package]] name = "chalk-engine" -version = "0.9.0" +version = "0.10.0" dependencies = [ - "chalk-macros 0.1.1", + "chalk-macros 0.10.0", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "chalk-integration" -version = "0.1.0" +version = "0.10.0" dependencies = [ - "chalk-engine 0.9.0", - "chalk-ir 0.1.0", - "chalk-macros 0.1.1", - "chalk-parse 0.1.0", - "chalk-rust-ir 0.1.0", - "chalk-solve 0.1.0", + "chalk-derive 0.10.0", + "chalk-engine 0.10.0", + "chalk-ir 0.10.0", + "chalk-macros 0.10.0", + "chalk-parse 0.10.0", + "chalk-rust-ir 0.10.0", + "chalk-solve 0.10.0", "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", "salsa 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "chalk-ir" -version = "0.1.0" +version = "0.10.0" dependencies = [ - "chalk-derive 0.1.0", - "chalk-engine 0.9.0", - "chalk-macros 0.1.1", + "chalk-derive 0.10.0", + "chalk-engine 0.10.0", + "chalk-macros 0.10.0", "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "chalk-macros" -version = "0.1.1" +version = "0.10.0" dependencies = [ "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "chalk-parse" -version = "0.1.0" +version = "0.10.0" dependencies = [ "lalrpop 0.17.2 (registry+https://github.com/rust-lang/crates.io-index)", "lalrpop-intern 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -227,23 +228,23 @@ dependencies = [ [[package]] name = "chalk-rust-ir" -version = "0.1.0" +version = "0.10.0" dependencies = [ - "chalk-derive 0.1.0", - "chalk-engine 0.9.0", - "chalk-ir 0.1.0", - "chalk-macros 0.1.1", + "chalk-derive 0.10.0", + "chalk-engine 0.10.0", + "chalk-ir 0.10.0", + "chalk-macros 0.10.0", ] [[package]] name = "chalk-solve" -version = "0.1.0" +version = "0.10.0" dependencies = [ - "chalk-derive 0.1.0", - "chalk-engine 0.9.0", - "chalk-ir 0.1.0", - "chalk-macros 0.1.1", - "chalk-rust-ir 0.1.0", + "chalk-derive 0.10.0", + "chalk-engine 0.10.0", + "chalk-ir 0.10.0", + "chalk-macros 0.10.0", + "chalk-rust-ir 0.10.0", "ena 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index fc69845fe32..8b9a6bf9ee3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chalk" -version = "0.1.0" +version = "0.10.0" description = "Model of the Rust trait system" license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] @@ -8,6 +8,7 @@ repository = "https://github.com/rust-lang/chalk" readme = "README.md" keywords = ["compiler", "traits", "prolog"] edition = "2018" +publish = false [features] bench = [] @@ -21,36 +22,13 @@ salsa = "0.10.0" serde = "1.0" serde_derive = "1.0" -[dependencies.chalk-parse] -version = "0.1.0" -path = "chalk-parse" - -[dependencies.chalk-ir] -version = "0.1.0" -path = "chalk-ir" - -[dependencies.chalk-solve] -version = "0.1.0" -path = "chalk-solve" - -[dependencies.chalk-macros] -version = "0.1.0" -path = "chalk-macros" - -[dependencies.chalk-engine] -version = "0.9.0" -path = "chalk-engine" - -[dependencies.chalk-rust-ir] -version = "0.1.0" -path = "chalk-rust-ir" - -[dependencies.chalk-derive] -version = "0.1.0" -path = "chalk-derive" - -[dependencies.chalk-integration] -version = "0.1.0" -path = "chalk-integration" +chalk-macros = { version = "0.10.0", path = "chalk-macros" } +chalk-derive = { version = "0.10.0", path = "chalk-derive" } +chalk-engine = { version = "0.10.0", path = "chalk-engine" } +chalk-ir = { version = "0.10.0", path = "chalk-ir" } +chalk-rust-ir = { version = "0.10.0", path = "chalk-rust-ir" } +chalk-solve = { version = "0.10.0", path = "chalk-solve" } +chalk-parse = { version = "0.10.0", path = "chalk-parse" } +chalk-integration = { version = "0.10.0", path = "chalk-integration" } [workspace] diff --git a/RELEASES.md b/RELEASES.md index 1da9b86fb61..8dd9623d3a6 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,7 +1,6 @@ -The `chalk-engine` and `chalk-macros` crates are published to -crates.io periodically for use by the compiler. The rest of chalk is -not yet published, though it might be nice to publish the interpreter -at some point. +# Release 0.10.0 + +- Too many changes to list # Release 0.9.0 diff --git a/chalk-derive/Cargo.toml b/chalk-derive/Cargo.toml index 828615dd4ca..74b18ae3e5b 100644 --- a/chalk-derive/Cargo.toml +++ b/chalk-derive/Cargo.toml @@ -1,6 +1,7 @@ [package] name = "chalk-derive" -version = "0.1.0" +version = "0.10.0" +description = "A helper crate for use by chalk crates for `derive` macros." license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] repository = "https://github.com/rust-lang/chalk" @@ -15,7 +16,4 @@ proc-macro = true synstructure = "0.12.1" quote = "1.0.2" proc-macro2 = "1.0.3" - -[dependencies.syn] -version = "1.0.5" -features = ["full"] +syn = { version = "1.0.5", features = ["full"] } diff --git a/chalk-derive/README.md b/chalk-derive/README.md new file mode 100644 index 00000000000..43fa19a0385 --- /dev/null +++ b/chalk-derive/README.md @@ -0,0 +1,3 @@ +A helper crate for use by chalk crates for `derive` macros. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-engine/Cargo.toml b/chalk-engine/Cargo.toml index ee465bdde28..8fee74988ba 100644 --- a/chalk-engine/Cargo.toml +++ b/chalk-engine/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chalk-engine" -version = "0.9.0" +version = "0.10.0" description = "Core trait engine from Chalk project" license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] @@ -15,6 +15,4 @@ default = [] [dependencies] rustc-hash = { version = "1.0.0" } -[dependencies.chalk-macros] -version = "0.1.0" -path = "../chalk-macros" +chalk-macros = { version = "0.10.0", path = "../chalk-macros" } diff --git a/chalk-engine/README.md b/chalk-engine/README.md index 51907628151..b396aa45668 100644 --- a/chalk-engine/README.md +++ b/chalk-engine/README.md @@ -1,3 +1,3 @@ -The core trait solving engine used in Chalk. This engine is meant to -be reused by rustc. Other projects may of course re-use it too, if you -have a need, but don't expect much stability in the interface yet. +The core crate for Chalk. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-integration/Cargo.toml b/chalk-integration/Cargo.toml index 0f069ba470f..ce2630c1069 100644 --- a/chalk-integration/Cargo.toml +++ b/chalk-integration/Cargo.toml @@ -1,38 +1,22 @@ [package] name = "chalk-integration" -version = "0.1.0" +version = "0.10.0" license = "Apache-2.0/MIT" description = "Sample solver setup for Chalk" authors = ["Rust Compiler Team", "Chalk developers"] repository = "https://github.com/rust-lang/chalk" keywords = ["compiler", "traits", "prolog"] edition = "2018" +publish = false [dependencies] lalrpop-intern = "0.15.1" salsa = "0.10.0" -[dependencies.chalk-engine] -version = "0.9.0" -path = "../chalk-engine" - -[dependencies.chalk-solve] -version = "0.1.0" -path = "../chalk-solve" - -[dependencies.chalk-parse] -version = "0.1.0" -path = "../chalk-parse" - -[dependencies.chalk-ir] -version = "0.1.0" -path = "../chalk-ir" -features = ["default-interner"] - -[dependencies.chalk-rust-ir] -version = "0.1.0" -path = "../chalk-rust-ir" - -[dependencies.chalk-macros] -version = "0.1.0" -path = "../chalk-macros" +chalk-macros = { version = "0.10.0", path = "../chalk-macros" } +chalk-derive = { version = "0.10.0", path = "../chalk-derive" } +chalk-engine = { version = "0.10.0", path = "../chalk-engine" } +chalk-ir = { version = "0.10.0", path = "../chalk-ir", features = ["default-interner"] } +chalk-rust-ir = { version = "0.10.0", path = "../chalk-rust-ir" } +chalk-solve = { version = "0.10.0", path = "../chalk-solve" } +chalk-parse = { version = "0.10.0", path = "../chalk-parse" } diff --git a/chalk-integration/README.md b/chalk-integration/README.md new file mode 100644 index 00000000000..1adfbed0b90 --- /dev/null +++ b/chalk-integration/README.md @@ -0,0 +1,3 @@ +A library that takes AST from `chalk-parse` and uses it to drive `chalk-solve`. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-ir/Cargo.toml b/chalk-ir/Cargo.toml index 07e97c54611..7a8d1039957 100644 --- a/chalk-ir/Cargo.toml +++ b/chalk-ir/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chalk-ir" -version = "0.1.0" +version = "0.10.0" description = "Chalk's internal representation of types, goals, and clauses" license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] @@ -12,17 +12,9 @@ edition = "2018" [dependencies] lalrpop-intern = { version = "0.15.1", optional = true } -[dependencies.chalk-macros] -version = "0.1.0" -path = "../chalk-macros" - -[dependencies.chalk-engine] -version = "0.9.0" -path = "../chalk-engine" - -[dependencies.chalk-derive] -version = "0.1.0" -path = "../chalk-derive" +chalk-macros = { version = "0.10.0", path = "../chalk-macros" } +chalk-derive = { version = "0.10.0", path = "../chalk-derive" } +chalk-engine = { version = "0.10.0", path = "../chalk-engine" } [features] default = [] diff --git a/chalk-ir/README.md b/chalk-ir/README.md new file mode 100644 index 00000000000..968ad493786 --- /dev/null +++ b/chalk-ir/README.md @@ -0,0 +1,3 @@ +A rust type library for chalk. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-macros/Cargo.toml b/chalk-macros/Cargo.toml index 5dd9dcb844b..c20baf5855e 100644 --- a/chalk-macros/Cargo.toml +++ b/chalk-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chalk-macros" -version = "0.1.1" +version = "0.10.0" description = "Macros for Chalk" license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] diff --git a/chalk-macros/README.md b/chalk-macros/README.md index ec2f9433334..6c67288bba1 100644 --- a/chalk-macros/README.md +++ b/chalk-macros/README.md @@ -1 +1,3 @@ Various macros used within Chalk. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-parse/Cargo.toml b/chalk-parse/Cargo.toml index e4537a7cafa..028b9e89451 100644 --- a/chalk-parse/Cargo.toml +++ b/chalk-parse/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "chalk-parse" -version = "0.1.0" +version = "0.10.0" description = "Parser for the Chalk project" license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] @@ -9,14 +9,12 @@ readme = "README.md" keywords = ["compiler", "traits", "prolog"] build = "build.rs" # LALRPOP preprocessing edition = "2018" - -# Add a dependency on the LALRPOP runtime library: -[dependencies.lalrpop-util] -version = "0.17" +publish = false [build-dependencies.lalrpop] version = "0.17" [dependencies] lalrpop-intern = "0.15.1" +lalrpop-util = "0.17" regex = "1.0.5" diff --git a/chalk-parse/README.md b/chalk-parse/README.md index 3c5d280cdec..0043af65da7 100644 --- a/chalk-parse/README.md +++ b/chalk-parse/README.md @@ -1 +1,3 @@ Parser for the Chalk standalone trait system implementation. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-rust-ir/Cargo.toml b/chalk-rust-ir/Cargo.toml index d1cf2371c85..d42ad65436c 100644 --- a/chalk-rust-ir/Cargo.toml +++ b/chalk-rust-ir/Cargo.toml @@ -1,23 +1,14 @@ [package] name = "chalk-rust-ir" -version = "0.1.0" +version = "0.10.0" +description = "A library that defines the IR for Rust concepts like traits and impls." license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] repository = "https://github.com/rust-lang/chalk" edition = "2018" -[dependencies.chalk-ir] -version = "0.1.0" -path = "../chalk-ir" - -[dependencies.chalk-macros] -version = "0.1.0" -path = "../chalk-macros" - -[dependencies.chalk-engine] -version = "0.9.0" -path = "../chalk-engine" - -[dependencies.chalk-derive] -version = "0.1.0" -path = "../chalk-derive" +[dependencies] +chalk-macros = { version = "0.10.0", path = "../chalk-macros" } +chalk-derive = { version = "0.10.0", path = "../chalk-derive" } +chalk-engine = { version = "0.10.0", path = "../chalk-engine" } +chalk-ir = { version = "0.10.0", path = "../chalk-ir" } diff --git a/chalk-rust-ir/README.md b/chalk-rust-ir/README.md new file mode 100644 index 00000000000..d0d41af95f7 --- /dev/null +++ b/chalk-rust-ir/README.md @@ -0,0 +1,3 @@ +A library that defines the IR for Rust concepts like traits and impls. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information. diff --git a/chalk-solve/Cargo.toml b/chalk-solve/Cargo.toml index ebf5f35a000..04dfc50e04a 100644 --- a/chalk-solve/Cargo.toml +++ b/chalk-solve/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "chalk-solve" -version = "0.1.0" -license = "Apache-2.0/MIT" +version = "0.10.0" description = "Combines the chalk-engine with chalk-ir" +license = "Apache-2.0/MIT" authors = ["Rust Compiler Team", "Chalk developers"] repository = "https://github.com/rust-lang/chalk" readme = "README.md" @@ -15,22 +15,8 @@ itertools = "0.9.0" petgraph = "0.4.13" rustc-hash = { version = "1.0.0" } -[dependencies.chalk-macros] -version = "0.1.0" -path = "../chalk-macros" - -[dependencies.chalk-derive] -version = "0.1.0" -path = "../chalk-derive" - -[dependencies.chalk-engine] -version = "0.9.0" -path = "../chalk-engine" - -[dependencies.chalk-ir] -version = "0.1.0" -path = "../chalk-ir" - -[dependencies.chalk-rust-ir] -version = "0.1.0" -path = "../chalk-rust-ir" +chalk-macros = { version = "0.10.0", path = "../chalk-macros" } +chalk-derive = { version = "0.10.0", path = "../chalk-derive" } +chalk-engine = { version = "0.10.0", path = "../chalk-engine" } +chalk-ir = { version = "0.10.0", path = "../chalk-ir" } +chalk-rust-ir = { version = "0.10.0", path = "../chalk-rust-ir" } diff --git a/chalk-solve/README.md b/chalk-solve/README.md new file mode 100644 index 00000000000..bed41761d21 --- /dev/null +++ b/chalk-solve/README.md @@ -0,0 +1,3 @@ +A library that defines the rules that translates Rust IR to logical predicates. + +See [Github](https://github.com/rust-lang/chalk) for up-to-date information.