Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add std and inlay hints #8

Merged
merged 3 commits into from
Sep 14, 2021
Merged

Add std and inlay hints #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b384962
add std and inlay hints
HKalbasi Aug 19, 2021
f851885
add the trying branch for bors
HKalbasi Sep 14, 2021
6e506f9
add staging branch for bors
HKalbasi Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
branches:
- master
- trying
- staging

env:
CARGO_INCREMENTAL: 0
Expand Down Expand Up @@ -36,7 +38,11 @@ jobs:
node-version: '15'

- name: Build wasm
run: wasm-pack build --target web
run: |
cd rust-pack
cargo run
HKalbasi marked this conversation as resolved.
Show resolved Hide resolved
cd ../ra-wasm
wasm-pack build --target web
- name: Install www
uses: borales/[email protected]
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/netlify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ jobs:
node-version: '15'

- name: Build wasm
run: wasm-pack build --target web
run: |
cd rust-pack
cargo run
cd ../ra-wasm
wasm-pack build --target web
- name: Install www
uses: borales/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/.bundle
/vendor
/target
target
/_site
.sass-cache
.jekyll-cache
Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
To run:

```shell
$ cd rust-pack
$ cargo run
$ cd ../ra-wasm
$ wasm-pack build --target web
$ cd www
$ cd ../www
$ yarn
$ yarn start
```
0 .cargo/config → ra-wasm/.cargo/config
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Cargo.lock → ra-wasm/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Cargo.toml → ra-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ edition = "2018"
[lib]
crate-type = ["cdylib"]

[features]
dev = ["console_error_panic_hook"]

[dependencies]
console_error_panic_hook = { version = "0.1.6", optional = true }
console_error_panic_hook = { version = "0.1.6" }
instant = { version = "0.1", features = ["wasm-bindgen"] }
log = { version = "0.4.14", features = ["release_max_level_warn"] }
serde = { version = "1.0.125", features = ["derive"] }
Expand All @@ -22,4 +19,5 @@ wasm-bindgen = "0.2.72"
wasm-bindgen-rayon = "1.0.2"

ide = { version = "0.0.44", package = "ra_ap_ide" }
cfg = { version = "0.0.44", package = "ra_ap_cfg" }
ide_db = { version = "0.0.44", package = "ra_ap_ide_db" }
Loading