Use libraries merged from rust-lib directly (#3137)

This commit is contained in:
Michał Wawrzyniec Urbańczyk 2021-11-05 16:55:55 +01:00 committed by GitHub
parent e18322e802
commit 848cef7dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 124 additions and 349 deletions

299
Cargo.lock generated
View File

@ -76,7 +76,7 @@ dependencies = [
"clap",
"itertools 0.10.0",
"proc-macro2 1.0.26",
"syn 1.0.72",
"syn",
"uuid",
]
@ -353,7 +353,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
]
[[package]]
@ -364,7 +364,7 @@ checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
]
[[package]]
@ -383,16 +383,7 @@ checksum = "1056f553da426e9c025a662efa48b52e62e0a3a7648aa2d15aeaaf7f0d329357"
name = "enso-automata"
version = "0.2.0"
dependencies = [
"enso-prelude 0.2.6",
]
[[package]]
name = "enso-automata"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9b028792f442d36cdd2df02a29ef988c219a9ebce952015bb1c2bcb5942d261"
dependencies = [
"enso-prelude 0.2.0",
"enso-prelude",
]
[[package]]
@ -400,59 +391,27 @@ name = "enso-data"
version = "0.2.0"
dependencies = [
"criterion",
"enso-prelude 0.2.6",
"enso-prelude",
"itertools 0.9.0",
"rustversion",
"serde",
"typenum",
]
[[package]]
name = "enso-data"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39dba144366e08671b102fd6feca76be1623e05816a3ba43ab05b2aaa45a625a"
dependencies = [
"enso-prelude 0.2.0",
"rustversion",
"serde",
"typenum",
]
[[package]]
name = "enso-flexer"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b9c223330c46c505fed7c47894a22930eeacaa71fd914787754ee55baf8dd9a"
dependencies = [
"enso-automata 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enso-lazy-reader 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enso-logger 0.3.0",
"enso-macro-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enso-prelude 0.2.0",
"itertools 0.8.2",
"nonempty",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"unicode-segmentation",
"wasm-bindgen",
]
[[package]]
name = "enso-flexer"
version = "0.2.1"
dependencies = [
"enso-automata 0.2.0",
"enso-lazy-reader 0.2.0",
"enso-logger 0.3.1",
"enso-macro-utils 0.2.0",
"enso-prelude 0.2.6",
"enso-automata",
"enso-lazy-reader",
"enso-logger",
"enso-macro-utils",
"enso-prelude",
"itertools 0.8.2",
"nonempty",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-test",
@ -470,39 +429,16 @@ dependencies = [
name = "enso-lazy-reader"
version = "0.2.0"
dependencies = [
"enso-prelude 0.2.6",
"enso-prelude",
"itertools 0.8.2",
]
[[package]]
name = "enso-lazy-reader"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b8cd22a53732103872eef4f1acbec0920ced09efb336fb06740a898d9762523"
dependencies = [
"enso-prelude 0.2.0",
"itertools 0.8.2",
]
[[package]]
name = "enso-logger"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed27bf8ac2768a9224fd66863de4384b42bf16e079e02dd507798ce71dd4d2d"
dependencies = [
"enso-prelude 0.2.0",
"enso-shapely 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "enso-logger"
version = "0.3.1"
dependencies = [
"enso-prelude 0.2.6",
"enso-shapely 0.2.0",
"enso-prelude",
"enso-shapely",
"js-sys",
"wasm-bindgen",
"web-sys",
@ -514,55 +450,15 @@ version = "0.2.0"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"wasm-bindgen-test",
]
[[package]]
name = "enso-macro-utils"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64e4c3aca9d82b782043ad1378929e03813ee00e444858caddd6ec32580eff08"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
]
[[package]]
name = "enso-optics"
version = "0.2.0"
dependencies = [
"enso-prelude 0.2.6",
]
[[package]]
name = "enso-prelude"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8db3cd4b9ac308f393eed97f3539b8e81ece4d93a384cdfb10c109e56f1f61e3"
dependencies = [
"anyhow",
"backtrace",
"boolinator",
"bumpalo",
"derivative",
"derive_more",
"enclose",
"enso-shapely 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"failure",
"ifmt 0.2.0",
"itertools 0.8.2",
"lazy_static",
"nalgebra 0.21.1",
"num 0.2.1",
"object 0.21.1",
"paste 0.1.18",
"shrinkwraprs",
"smallvec",
"wasm-bindgen",
"weak-table 0.2.4",
"web-sys",
"enso-prelude",
]
[[package]]
@ -578,13 +474,13 @@ dependencies = [
"derivative",
"derive_more",
"enclose",
"enso-shapely 0.2.0",
"enso-shapely",
"failure",
"ifmt 0.3.3",
"ifmt",
"itertools 0.10.0",
"lazy_static",
"nalgebra 0.26.2",
"num 0.4.0",
"num",
"object 0.24.0",
"paste 1.0.5",
"serde",
@ -592,7 +488,7 @@ dependencies = [
"smallvec",
"wasm-bindgen",
"wasm-bindgen-test",
"weak-table 0.3.0",
"weak-table",
"web-sys",
]
@ -601,56 +497,28 @@ name = "enso-shapely"
version = "0.2.0"
dependencies = [
"derivative",
"enso-prelude 0.2.6",
"enso-shapely-macros 0.2.1",
"enso-prelude",
"enso-shapely-macros",
"paste 0.1.18",
"rustversion",
"shrinkwraprs",
"wasm-bindgen-test",
]
[[package]]
name = "enso-shapely"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061a335e6068e8960a315f62813a7196c3cde2c650ebd0e744f26b479baf3cd8"
dependencies = [
"derivative",
"enso-shapely-macros 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"paste 0.1.18",
"rustversion",
"shrinkwraprs",
]
[[package]]
name = "enso-shapely-macros"
version = "0.2.1"
dependencies = [
"Inflector",
"boolinator",
"enso-macro-utils 0.2.0",
"enso-macro-utils",
"itertools 0.8.2",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"wasm-bindgen-test",
]
[[package]]
name = "enso-shapely-macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3362771ca6e5a077479ae310c28e28abb56f4f62f2fe649719292227685dece0"
dependencies = [
"Inflector",
"boolinator",
"enso-macro-utils 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.2",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
]
[[package]]
name = "failure"
version = "0.1.8"
@ -669,7 +537,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"synstructure",
]
@ -689,14 +557,14 @@ dependencies = [
name = "flexer-test-definition"
version = "0.1.0"
dependencies = [
"enso-flexer 0.2.1",
"enso-flexer",
]
[[package]]
name = "flexer-test-generation"
version = "0.1.0"
dependencies = [
"enso-flexer 0.2.1",
"enso-flexer",
"flexer-test-definition",
]
@ -758,40 +626,16 @@ dependencies = [
"libc",
]
[[package]]
name = "ifmt"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abec215007c2ef1ccfb17a6bae6a87736fedb573860d2606ddec08b427666164"
dependencies = [
"ifmt-impl 0.2.0",
"proc-macro-hack",
]
[[package]]
name = "ifmt"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7dd0f8e1404f15475d8a2ca84c2942aa00ac17804ce555294a96f6b5cdf80750"
dependencies = [
"ifmt-impl 0.3.3",
"ifmt-impl",
"proc-macro-hack",
]
[[package]]
name = "ifmt-impl"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "744691ef283c5d8d4321f75cfa0e3b460b5adf3338bb7dcfd060f33e40300072"
dependencies = [
"lazy_static",
"proc-macro-hack",
"proc-macro2 0.4.30",
"quote 0.6.13",
"regex",
"syn 0.15.44",
]
[[package]]
name = "ifmt-impl"
version = "0.3.3"
@ -803,7 +647,7 @@ dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"regex",
"syn 1.0.72",
"syn",
]
[[package]]
@ -883,8 +727,8 @@ name = "lexer"
version = "0.1.0"
dependencies = [
"criterion",
"enso-flexer 0.2.0",
"enso-prelude 0.2.0",
"enso-flexer",
"enso-prelude",
"lexer-definition",
]
@ -892,8 +736,8 @@ dependencies = [
name = "lexer-definition"
version = "0.1.0"
dependencies = [
"enso-flexer 0.2.0",
"enso-prelude 0.2.0",
"enso-flexer",
"enso-prelude",
"uuid",
]
@ -1012,27 +856,13 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f962080273ac958f790079cfc886b5b9d722969dbd7b03f473902bdfe5c69b1"
[[package]]
name = "num"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36"
dependencies = [
"num-bigint 0.2.6",
"num-complex 0.2.4",
"num-integer",
"num-iter",
"num-rational 0.2.4",
"num-traits",
]
[[package]]
name = "num"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
dependencies = [
"num-bigint 0.4.2",
"num-bigint",
"num-complex 0.4.0",
"num-integer",
"num-iter",
@ -1040,17 +870,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "num-bigint"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
dependencies = [
"autocfg",
"num-integer",
"num-traits",
]
[[package]]
name = "num-bigint"
version = "0.4.2"
@ -1119,7 +938,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
dependencies = [
"autocfg",
"num-bigint 0.2.6",
"num-integer",
"num-traits",
]
@ -1142,7 +960,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a"
dependencies = [
"autocfg",
"num-bigint 0.4.2",
"num-bigint",
"num-integer",
"num-traits",
]
@ -1172,10 +990,6 @@ name = "object"
version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693"
dependencies = [
"flate2",
"wasmparser",
]
[[package]]
name = "object"
@ -1197,9 +1011,9 @@ name = "parser"
version = "0.1.0"
dependencies = [
"criterion",
"enso-data 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enso-logger 0.3.0",
"enso-prelude 0.2.0",
"enso-data",
"enso-logger",
"enso-prelude",
"itertools 0.10.0",
"lexer",
]
@ -1495,7 +1309,7 @@ checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
]
[[package]]
@ -1519,7 +1333,7 @@ dependencies = [
"itertools 0.8.2",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
]
[[package]]
@ -1564,17 +1378,6 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "syn"
version = "0.15.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
dependencies = [
"proc-macro2 0.4.30",
"quote 0.6.13",
"unicode-xid 0.1.0",
]
[[package]]
name = "syn"
version = "1.0.72"
@ -1594,7 +1397,7 @@ checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"unicode-xid 0.2.1",
]
@ -1624,7 +1427,7 @@ checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
]
[[package]]
@ -1736,7 +1539,7 @@ dependencies = [
"log",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"wasm-bindgen-shared",
]
@ -1771,7 +1574,7 @@ checksum = "e85031354f25eaebe78bb7db1c3d86140312a911a106b2e29f9cc440ce3e7668"
dependencies = [
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -1818,23 +1621,11 @@ dependencies = [
"log",
"proc-macro2 1.0.26",
"quote 1.0.8",
"syn 1.0.72",
"syn",
"wasm-bindgen-backend",
"weedle",
]
[[package]]
name = "wasmparser"
version = "0.57.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32fddd575d477c6e9702484139cf9f23dcd554b06d185ed0f56c857dd3a47aa6"
[[package]]
name = "weak-table"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78e37715e810547b2ae9b6980b25bef319cb779d6c42faa8010ba47e83178113"
[[package]]
name = "weak-table"
version = "0.3.0"

View File

@ -573,8 +573,6 @@ dependencies = [
[[package]]
name = "enso-automata"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9b028792f442d36cdd2df02a29ef988c219a9ebce952015bb1c2bcb5942d261"
dependencies = [
"enso-prelude",
]
@ -598,8 +596,6 @@ dependencies = [
[[package]]
name = "enso-data"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39dba144366e08671b102fd6feca76be1623e05816a3ba43ab05b2aaa45a625a"
dependencies = [
"enso-prelude",
"rustversion",
@ -628,8 +624,6 @@ dependencies = [
[[package]]
name = "enso-generics"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "345a68488069ed550c31127513445628bcaff9da467aa8e833067149cf8bc445"
dependencies = [
"nalgebra 0.21.1",
"serde",
@ -638,8 +632,6 @@ dependencies = [
[[package]]
name = "enso-logger"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b19f60656c02b5ba66948f1e9601632fc08d1bbbe663dada3bfdcb174b907eed"
dependencies = [
"enso-prelude",
"enso-shapely",
@ -651,8 +643,6 @@ dependencies = [
[[package]]
name = "enso-macro-utils"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64e4c3aca9d82b782043ad1378929e03813ee00e444858caddd6ec32580eff08"
dependencies = [
"proc-macro2 1.0.27",
"quote 1.0.9",
@ -662,8 +652,6 @@ dependencies = [
[[package]]
name = "enso-optics"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f4a34423408c57e6285d19ae88b53b9e0d254983bbcbf301d3f4a5c38f15802"
dependencies = [
"enso-prelude",
]
@ -671,8 +659,6 @@ dependencies = [
[[package]]
name = "enso-prelude"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a7721506abe056be4f27f58131fb3677f38e62d0d9696c9920ba94777e52d56"
dependencies = [
"anyhow",
"backtrace",
@ -734,8 +720,6 @@ dependencies = [
[[package]]
name = "enso-shapely"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "061a335e6068e8960a315f62813a7196c3cde2c650ebd0e744f26b479baf3cd8"
dependencies = [
"derivative",
"enso-shapely-macros",
@ -747,8 +731,6 @@ dependencies = [
[[package]]
name = "enso-shapely-macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3362771ca6e5a077479ae310c28e28abb56f4f62f2fe649719292227685dece0"
dependencies = [
"Inflector",
"boolinator",

View File

@ -9,9 +9,9 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
enso-frp = { path = "../../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-logger = { path = "../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../lib/rust/shapely/impl"}
ensogl-core = { path = "../../ensogl/lib/core" }
ensogl-gui-components = { path = "../../ensogl/lib/components" }
ensogl-text = { path = "../../ensogl/lib/text" }

View File

@ -9,9 +9,9 @@ crate-type = ["rlib", "cdylib"]
[dependencies]
enso-frp = { path = "../../../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-logger = { path = "../../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
enso-types = { path = "../../../lib/types" }
ensogl-core = { path = "../core" }
ensogl-text = { path = "../text" }

View File

@ -15,13 +15,13 @@ no_unboxed_callbacks = []
[dependencies]
code-builder = { path = "../../../lib/code-builder" }
enso-callback = { path = "../../../lib/callback" }
enso-data = { version = "0.2.0" }
enso-data = { path = "../../../../../../lib/rust/data"}
enso-frp = { path = "../../../lib/frp" }
enso-generics = { version = "0.2.0" }
enso-logger = { version = "0.3.1" }
enso-optics = { version = "0.2.0" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-generics = { path = "../../../../../../lib/rust/generics"}
enso-logger = { path = "../../../../../../lib/rust/logger"}
enso-optics = { path = "../../../../../../lib/rust/optics"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
enso-shortcuts = { path = "../../../lib/shortcuts" }
enso-types = { path = "../../../lib/types" }
ensogl-system-web = { path = "../../../lib/system/web" }

View File

@ -9,8 +9,8 @@ crate-type = ["rlib", "cdylib"]
[dependencies]
enso-frp = { path = "../../../lib/frp" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
enso-types = { path = "../../../lib/types" }
ensogl-core = { path = "../../../ensogl/lib/core" }
ensogl-text-embedded-fonts = { path = "embedded-fonts" }

View File

@ -9,7 +9,7 @@ crate-type = ["cdylib", "rlib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../../../lib/rust/prelude"}
[build-dependencies]
ensogl-build-utilities = { path = "../../../../build" }

View File

@ -8,7 +8,7 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../../../lib/rust/prelude"}
js-sys = { version = "0.3.28" }
nalgebra = { version = "0.26.1" }
wasm-bindgen = { version = "=0.2.58" }

View File

@ -7,8 +7,8 @@ edition = "2018"
[dependencies]
ensogl-system-web = { path = "../../../lib/system/web" }
enso-frp = { path = "../../../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-logger = { path = "../../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
js-sys = { version = "0.3.28" }
wasm-bindgen = { version = "=0.2.58", features = ["nightly"] }
wasm-bindgen-futures = { version = "0.4.8" }

View File

@ -11,11 +11,11 @@ crate-type = ["cdylib", "rlib"]
analytics = { version = "0.1.0", path = "lib/analytics" }
enso-args = { path = "lib/args" }
enso-callback = { path = "../lib/callback" }
enso-data = { version = "0.2.0" }
enso-data = { path = "../../../../lib/rust/data"}
enso-frp = { path = "../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-logger = { path = "../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../lib/rust/shapely/impl"}
ensogl = { path = "../ensogl" }
ensogl-examples = { path = "../ensogl/example" }
ensogl-gui-components = { path = "../ensogl/lib/components" }

View File

@ -7,5 +7,5 @@ edition = "2018"
[dependencies]
ensogl = { path = "../../../ensogl" }
enso-config = { path = "../../../lib/config" }
enso-prelude = { version = "0.2.6" }
enso-logger = { version = "0.3.1" }
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-logger = { path = "../../../../../../lib/rust/logger" }

View File

@ -17,7 +17,7 @@ serde_json = { version = "1.0" }
shrinkwraprs = { version = "0.2.1" }
uuid = { version = "0.8.1", features = ["serde", "v4", "wasm-bindgen"] }
ast-macros = { path = "../macros" }
enso-data = { version = "0.2.0" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-data = { path = "../../../../../../../lib/rust/data"}
enso-prelude = { path = "../../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../../lib/rust/shapely/impl"}
utils = { path = "../../utils" }

View File

@ -14,8 +14,8 @@ default = []
proc-macro2 = "1.0"
quote = "1.0"
Inflector = "0.11.4"
enso-macro-utils = { version = "0.2.0" }
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../../../lib/rust/prelude"}
enso-macro-utils = { path = "../../../../../../../lib/rust/macro-utils"}
[dependencies.syn]
version = "1.0"

View File

@ -8,10 +8,10 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-data = { version = "0.2.0" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-data = { path = "../../../../../../lib/rust/data"}
enso-logger = { path = "../../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
json-rpc = { path = "../json-rpc" }
utils = { path = "../utils" }
chrono = { version = "0.4", features = ["serde"] }

View File

@ -8,8 +8,8 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0" }
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
ensogl-system-web = { path = "../../../lib/system/web" }
futures = { version = "0.3.1" }
failure = { version = "0.1.6" }

View File

@ -10,8 +10,8 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
ast = { path = "../ast/impl" }
enso-data = { version = "0.2.0" }
enso-prelude = { version = "0.2.6" }
enso-data = { path = "../../../../../../lib/rust/data"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
utils = { path = "../utils" }
console_error_panic_hook = { version = "0.1.6" }
failure = { version = "0.1" }

View File

@ -6,8 +6,8 @@ edition = "2018"
[dependencies]
ast = { path = "../ast/impl" }
enso-data = { version = "0.2.0" }
enso-prelude = { version = "0.2.6" }
enso-data = { path = "../../../../../../lib/rust/data"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
failure = { version = "0.1.6" }
utils = { path = "../utils" }

View File

@ -9,10 +9,10 @@ crate-type = ["cdylib", "rlib"]
[dependencies]
ast = { path = "../../ast/impl" }
enso-prelude = { version = "0.2.6" }
span-tree = { path = "../../span-tree" }
ensogl-system-web = { path = "../../../../lib/system/web" }
enso-logger = { version = "0.3.1" }
enso-prelude = { path = "../../../../../../../lib/rust/prelude"}
enso-logger = { path = "../../../../../../../lib/rust/logger"}
wasm-bindgen = { version = "=0.2.58", features = [
"nightly",
"serde-serialize"

View File

@ -8,8 +8,8 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-shapely = { version = "0.2.0 " }
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }

View File

@ -11,10 +11,10 @@ crate-type = ["cdylib", "rlib"]
ast = { path = "../lib/ast/impl" }
enso-args = { path = "../lib/args" }
enso-frp = { path = "../../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-logger = { path = "../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../lib/rust/prelude"}
enso-shapely = { path = "../../../../../lib/rust/shapely/impl"}
enso-protocol = { path = "../lib/enso-protocol" }
enso-shapely = { version = "0.2.0" }
ensogl = { path = "../../ensogl" }
enso-config = { path = "../../lib/config" }
ensogl-gui-components = { path = "../../ensogl/lib/components" }

View File

@ -13,10 +13,10 @@ ast = { version = "0.1.0", path = "../../lib/ast/impl" }
bimap = { version = "0.4.0"}
enso-args = { version = "0.1.0", path = "../../lib/args" }
enso-frp = { version = "0.1.0", path = "../../../lib/frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-logger = { path = "../../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../../lib/rust/prelude"}
enso-protocol = { version = "0.1.0", path = "../../lib/enso-protocol" }
enso-shapely = { version = "0.2.0" }
enso-shapely = { path = "../../../../../../lib/rust/shapely/impl"}
ensogl = { version = "0.1.0", path = "../../../ensogl" }
ensogl-gui-components = { version = "0.1.0", path = "../../../ensogl/lib/components" }
ensogl-text = { version = "0.1.0", path = "../../../ensogl/lib/text" }

View File

@ -7,4 +7,4 @@ edition = "2018"
[lib]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../lib/rust/prelude" }

View File

@ -9,4 +9,4 @@ edition = "2018"
[features]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../lib/rust/prelude" }

View File

@ -8,9 +8,9 @@ edition = "2018"
[dependencies]
enso-callback = { path = "../../lib/callback" }
enso-generics = { version = "0.2.0" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-generics = { path = "../../../../../lib/rust/generics"}
enso-logger = { path = "../../../../../lib/rust/logger"}
enso-prelude = { path = "../../../../../lib/rust/prelude"}
ensogl-system-web = { path = "../system/web" }
Inflector = { version = "0.11.4" }
keyboard-types = { version = "0.5.0" }

View File

@ -8,4 +8,4 @@ edition = "2018"
crate-type = ["rlib", "cdylib"]
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../lib/rust/prelude" }

View File

@ -8,10 +8,10 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-automata = { version = "0.2.0" }
enso-automata = { path = "../../../../../lib/rust/automata" }
enso-frp = { path = "../frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-logger = { path = "../../../../../lib/rust/logger" }
enso-prelude = { path = "../../../../../lib/rust/prelude" }
ensogl-system-web = { path = "../../lib/system/web" }
wasm-bindgen = { version = "=0.2.58", features = [
"nightly",

View File

@ -8,10 +8,10 @@ edition = "2018"
crate-type = ["cdylib", "rlib"]
[dependencies]
enso-automata = { version = "0.2.0" }
enso-automata = { path = "../../../../../../lib/rust/automata" }
enso-logger = { path = "../../../../../../lib/rust/logger" }
enso-prelude = { path = "../../../../../../lib/rust/prelude" }
enso-frp = { path = "../../frp" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-shortcuts = { path = "../../shortcuts" }
ensogl-system-web = { path = "../../../lib/system/web" }
wasm-bindgen = { version = "=0.2.58", features = [

View File

@ -10,9 +10,9 @@ edition = "2018"
default = ["console_error_panic_hook"]
[dependencies]
enso-data = { version = "0.2.0" }
enso-logger = { version = "0.3.1" }
enso-prelude = { version = "0.2.6" }
enso-data = { path = "../../../../../../lib/rust/data" }
enso-logger = { path = "../../../../../../lib/rust/logger" }
enso-prelude = { path = "../../../../../../lib/rust/prelude" }
console_error_panic_hook = { version = "0.1.1", optional = true }
failure = { version = "0.1.5" }
gloo-timers = { version = "0.2.1", features = ["futures"] }

View File

@ -6,7 +6,7 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
enso-prelude = { version = "0.2.6" }
enso-prelude = { path = "../../../../../lib/rust/prelude"}
ensogl = { path = "../../ensogl" }
ensogl-system-web = { path = "../system/web" }
web-test-proc-macro = { path = "../web-test-proc-macro" }

View File

@ -12,7 +12,7 @@ test = true
bench = true
[dependencies]
enso-flexer = { version = "0.2.0" }
enso-prelude = { version = "0.2.0" }
enso-flexer = { version = "0.2.0", path = "../../flexer" }
enso-prelude = { version = "0.2.0", path = "../../prelude" }
uuid = { version = "0.8.1" , features = ["serde","v4","wasm-bindgen"] }

View File

@ -1813,6 +1813,7 @@ impl Default for EnsoLexer {
#[derive(Debug)]
pub struct State<Logger> {
/// The logger for the lexing state.
#[allow(dead_code)]
logger : Logger,
/// The bookmarks used by the lexer.
bookmarks : reader::BookmarkManager,
@ -1865,6 +1866,7 @@ pub struct State<Logger> {
/// The state entered when a literal CRLF is seen inside a text literal.
text_interpolate : group::Identifier,
/// A parent group for all comments.
#[allow(dead_code)]
comment : group::Identifier,
/// A state for lexing disable comments.
disable_comment : group::Identifier,
@ -1905,7 +1907,7 @@ where Logger : AnyLogger<Owned=Logger> + LoggerOps<DebugLevel> {
impl<Logger> enso_flexer::State for State<Logger>
where Logger : AnyLogger<Owned=Logger> + LoggerOps<DebugLevel> {
fn new(parent_logger:&impl AnyLogger) -> Self {
let logger = <Logger>::sub(parent_logger, "State");
let logger = parent_logger.sub("State");
let bookmarks = default();
let mut lexer_states = group::Registry::default();
let initial_state = lexer_states.define_group("ROOT",None);

View File

@ -12,12 +12,12 @@ test = true
bench = true
[dependencies]
enso-flexer = { version = "0.2.0" }
enso-prelude = { version = "0.2.0" }
enso-flexer = { version = "0.2.0", path = "../../flexer" }
enso-prelude = { version = "0.2.0", path = "../../prelude" }
lexer-definition = { path = "../definition", version = "0.1.0" }
[build-dependencies]
enso-flexer = { version = "0.2.0" }
enso-flexer = { version = "0.2.0", path = "../../flexer" }
lexer-definition = { path = "../definition", version = "0.1.0" }
[dev-dependencies]

View File

@ -222,7 +222,7 @@ impl<Input> Processor<Input> for Identity {
/// Formatter processor. It uses the provided formatter to format its input.
#[derive(Debug,Default)]
pub struct Formatter<T> {
formatter : T,
formatter : PhantomData<T>,
}
impl<Fmt,Lvl> Processor<Entry<Lvl>> for Formatter<Fmt>
@ -261,7 +261,7 @@ where C:consumer::Definition<Levels,Message> {
#[allow(missing_docs)]
pub struct Buffer<Input,Next> {
model : Rc<RefCell<BufferModel<Input,Next>>>,
closure : Closure<dyn Fn()>,
_closure: Closure<dyn Fn()>,
}
impl<Input,Next> Default for Buffer<Input,Next>
@ -274,7 +274,7 @@ impl<Input,Next> Default for Buffer<Input,Next>
println!("Debug mode. Logs will be enabled automatically.");
js::show_logs();
}
Self{model,closure}
Self{model, _closure: closure }
}
}

View File

@ -12,9 +12,9 @@ test = true
bench = true
[dependencies]
enso-data = { version = "0.2.0" }
enso-logger = { version = "0.3.0" }
enso-prelude = { version = "0.2.0" }
enso-data = { version = "0.2.0", path = "../data" }
enso-logger = { version = "0.3.0", path = "../logger" }
enso-prelude = { version = "0.2.0", path = "../prelude" }
lexer = { version = "0.1.0", path = "../lexer/generation" }
itertools = { version = "0.10.0" }