Skip to content

Commit f745070

Browse files
bors[bot]HKalbasi
andauthored
Merge #8
8: Add std and inlay hints r=matklad a=HKalbasi I actually done this as an experiment for adding [RA to playground](rust-lang/rust-playground#357) but I think this demo can also take advantage of this PR and by merging it, future people don't need to repeat my work. Fix #7 This satisfies me, but it is not great. Specially it is slower than RA on vscode, and I don't know why it should be that slow. Suggestions on this (and other problems) are welcome. Co-authored-by: hamidreza kalbasi <[email protected]>
2 parents 3cb4342 + f851885 commit f745070

23 files changed

+716
-198
lines changed

.github/workflows/ci.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- trying
78

89
env:
910
CARGO_INCREMENTAL: 0
@@ -36,7 +37,11 @@ jobs:
3637
node-version: '15'
3738

3839
- name: Build wasm
39-
run: wasm-pack build --target web
40+
run: |
41+
cd rust-pack
42+
cargo run
43+
cd ../ra-wasm
44+
wasm-pack build --target web
4045
4146
- name: Install www
4247
uses: borales/[email protected]

.github/workflows/netlify.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ jobs:
3535
node-version: '15'
3636

3737
- name: Build wasm
38-
run: wasm-pack build --target web
38+
run: |
39+
cd rust-pack
40+
cargo run
41+
cd ../ra-wasm
42+
wasm-pack build --target web
3943
4044
- name: Install www
4145
uses: borales/[email protected]

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/.bundle
22
/vendor
3-
/target
3+
target
44
/_site
55
.sass-cache
66
.jekyll-cache

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
To run:
44

55
```shell
6+
$ cd rust-pack
7+
$ cargo run
8+
$ cd ../ra-wasm
69
$ wasm-pack build --target web
7-
$ cd www
10+
$ cd ../www
811
$ yarn
912
$ yarn start
1013
```
File renamed without changes.

Cargo.lock renamed to ra-wasm/Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml renamed to ra-wasm/Cargo.toml

+2-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ edition = "2018"
77
[lib]
88
crate-type = ["cdylib"]
99

10-
[features]
11-
dev = ["console_error_panic_hook"]
12-
1310
[dependencies]
14-
console_error_panic_hook = { version = "0.1.6", optional = true }
11+
console_error_panic_hook = { version = "0.1.6" }
1512
instant = { version = "0.1", features = ["wasm-bindgen"] }
1613
log = { version = "0.4.14", features = ["release_max_level_warn"] }
1714
serde = { version = "1.0.125", features = ["derive"] }
@@ -22,4 +19,5 @@ wasm-bindgen = "0.2.72"
2219
wasm-bindgen-rayon = "1.0.2"
2320

2421
ide = { version = "0.0.44", package = "ra_ap_ide" }
22+
cfg = { version = "0.0.44", package = "ra_ap_cfg" }
2523
ide_db = { version = "0.0.44", package = "ra_ap_ide_db" }

0 commit comments

Comments
 (0)