Commit Graph

1597 Commits

Author SHA1 Message Date
bors[bot]
e2bc57e3c8 Merge #361
361: fix the cancellation bug r=matklad a=matklad

See https://github.com/salsa-rs/salsa/pull/103 for the upstream fix

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2018-12-30 08:10:13 +00:00
Aleksey Kladov
c97bb8f7e4 fix the cancellation bug 2018-12-30 11:09:17 +03:00
Aleksander Vognild Burkow
0cb270e75d Simplify failure bail code 2018-12-30 00:21:15 +01:00
bors[bot]
748fbb5371 Merge #360
360: Improve comments and code in ra_vfs r=DJMcNab a=DJMcNab

Some random code/comment improvements I saw whilst trying to understand `ra_vfs`.

Let's see if this works:
bors r+

Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
2018-12-29 22:46:54 +00:00
DJMcNab
5dd602f901 Reuse has_rs_extension in io.rs 2018-12-29 22:45:01 +00:00
Aleksander Vognild Burkow
ed47c93afe Install rustfmt in rustfmt test 2018-12-29 23:38:26 +01:00
Aleksander Vognild Burkow
09c20c8fcf Add better error message for Command failure 2018-12-29 23:38:26 +01:00
DJMcNab
07202f944c Remove some unnecessary unwraps by using the Result::ok
combinatoric
2018-12-29 22:33:28 +00:00
DJMcNab
c881fc607e Fix instance of uneeded brackets in use_statement (thanks to #333) 2018-12-29 22:32:39 +00:00
DJMcNab
f18e25f24c Improve comment contents 2018-12-29 22:30:54 +00:00
DJMcNab
764ddc0c85 Fix a switched line in a comment 2018-12-29 22:07:56 +00:00
Aleksander Vognild Burkow
ee9fc3f998 Document formatting capabilities 2018-12-29 21:57:46 +01:00
Aleksander Vognild Burkow
8b24f158f7 Add support for formatting entire document with rustfmt
Attempting to format a document when rustfmt isn't installed will result
in an error being returned to the frontend. An alternative
implementation would be returning zero replacements.
2018-12-29 21:57:46 +01:00
bors[bot]
7fe32938b6 Merge #359
359: Add more docs in ty.rs r=matklad a=flodiebold

Also get rid of the indirection through query_definitions for the type-related
queries.

Co-authored-by: Florian Diebold <flodiebold@gmail.com>
2018-12-29 19:31:32 +00:00
Florian Diebold
4142792d1f Add more docs in ty.rs
Also get rid of the indirection through query_definitions for the type-related
queries.
2018-12-29 20:27:13 +01:00
Aleksander Vognild Burkow
2aac6b0e34 Ignore intellij files 2018-12-29 20:09:36 +01:00
bors[bot]
4a3d6aa26a Merge #356
356: Fix a bug in char literal validation discovered through fuzzing r=matklad a=DJMcNab

We also add a Cargo.lock to the fuzzing directory, as that isn't gitignored automatically, so I imagine it should be committed.

Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
2018-12-29 12:50:34 +00:00
DJMcNab
b67a4e7a57 Add fuzz failure to the fuzz-failures directory 2018-12-29 12:45:48 +00:00
DJMcNab
054f22f231 Fix a fuzzing bug and add Cargo.lock to the fuzzing directory 2018-12-29 12:40:08 +00:00
bors[bot]
9220641ba4 Merge #355
355: Type variables / unification r=matklad a=flodiebold

This will really become necessary when we implement generics, but even now, it allows us to reason 'backwards' to infer types of expressions that we didn't understand for some reason.

This uses [ena](https://crates.io/crates/ena) to keep track of type variables.

Also turn `Ty::Tuple` from a `Vec` into an `Arc<[Ty]>` to keep `Ty` easily cloneable. Though to be honest I'm not sure how often we actually share data here, with all the make_muts and modifying...

Co-authored-by: Florian Diebold <flodiebold@gmail.com>
2018-12-29 12:24:40 +00:00
bors[bot]
a9528c540b Merge #354
354: Deny warnings on CI (#329) r=matklad a=DJMcNab

Fixes #329.

Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
2018-12-29 11:56:36 +00:00
DJMcNab
e7863d979f Use a different format for env vars 2018-12-29 11:37:25 +00:00
DJMcNab
3fb02c85d1 Readd quotes to -D warnings 2018-12-29 11:11:51 +00:00
Florian Diebold
b1590bdf6a Missing return type means unit, not unknown 2018-12-29 12:08:57 +01:00
Florian Diebold
cfa1de72eb Implement type variables
This will really become necessary when we implement generics, but even now, it
allows us to reason 'backwards' to infer types of expressions that we didn't
understand for some reason.

We use ena, the union-find implementation extracted from rustc, to keep track of
type variables.
2018-12-29 12:04:34 +01:00
DJMcNab
ab36ef7733 Remove duplicated env var 2018-12-29 10:49:40 +00:00
DJMcNab
5dbab81481 Reformat .travis.yml (using the vscode prettier extension)
TODO: Check this on CI. Maybe we should change the prettier script
in `editors/code`, or move it to somewhere else
(`tests/format` maybe)
Editing the script in editors/code would be easiest as
that means we don't have to double install some shared `node_modules`
2018-12-29 10:31:20 +00:00
DJMcNab
f4364993f9 Change typo of few to many 2018-12-29 10:26:52 +00:00
DJMcNab
7b431be2f7 Deny warnings on CI (#329) 2018-12-29 10:25:53 +00:00
bors[bot]
f3f073804c Merge #353
353: update README with Rust 1.31 r=matklad a=yerke

Update README with Rust 1.31, since Rust 2018 edition is already on stable

Co-authored-by: Yerkebulan Tulibergenov <yerkebulan@gmail.com>
2018-12-28 22:44:12 +00:00
Yerkebulan Tulibergenov
1719b93120 don't mention beta channel Rust in ROADMAP 2018-12-28 14:38:27 -08:00
Yerkebulan Tulibergenov
113a24855f update README with Rust 1.31 2018-12-28 14:02:23 -08:00
bors[bot]
751616f062 Merge #352
352: Macro extend selection r=matklad a=matklad

and a bunch of unrelated stuff

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2018-12-28 18:35:52 +00:00
Aleksey Kladov
7928995876 nameify structs&enums 2018-12-28 21:34:58 +03:00
Aleksey Kladov
11122e29b7 completion for enum variants 2018-12-28 21:07:47 +03:00
Aleksey Kladov
1a860dba38 simplify 2018-12-28 20:45:58 +03:00
Aleksey Kladov
5299a35e3d extend selection works with macros 2018-12-28 20:33:39 +03:00
Aleksey Kladov
10e687f281 fix lockfile 2018-12-28 19:46:35 +03:00
bors[bot]
7a268b9b96 Merge #350
350: Super simple macro support r=matklad a=matklad

Super simple support for macros, mostly for figuring out how to fit them into the current architecture. Expansion is hard-coded and string based (mid-term, we should try to copy-paste macro-by-example expander from rustc). 

Ideally, we should handle

* highlighting inside the macro (done)
* extend selection inside the macro 
* completion inside the macro
* indexing structs, produced by the macro

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2018-12-28 16:17:19 +00:00
bors[bot]
9d6740a9c9 Merge #351
351: ⬆️ salsa r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2018-12-28 16:11:45 +00:00
Aleksey Kladov
13631a2955 ⬆️ salsa 2018-12-28 19:10:31 +03:00
Aleksey Kladov
b911ee542b move macro to a separate module 2018-12-28 18:21:30 +03:00
Aleksey Kladov
fd33c89207 switch to FileRange 2018-12-28 18:17:43 +03:00
Aleksey Kladov
02924174bb introduce FileRange 2018-12-28 18:17:43 +03:00
Aleksey Kladov
d7440a5f49 highlight macro idents 2018-12-28 18:17:43 +03:00
Aleksey Kladov
406505e096 super simplistic macro expansion 2018-12-28 16:59:58 +03:00
Aleksey Kladov
072028e679 add macro-call node 2018-12-28 13:27:30 +03:00
Aleksey Kladov
dc496d0516 move highlightning to a separate file 2018-12-28 13:14:39 +03:00
bors[bot]
161054a616 Merge #349
349: Bump serde from 1.0.82 to 1.0.83 r=matklad a=dependabot[bot]

Bumps [serde](https://github.com/serde-rs/serde) from 1.0.82 to 1.0.83.
<details>
<summary>Release notes</summary>

*Sourced from [serde's releases](https://github.com/serde-rs/serde/releases).*

> ## v1.0.83
> - Support a `rename_all` specification that applies only to the Serialize impl or only to the Deserialize impl ([#1447](https://github-redirect.dependabot.com/serde-rs/serde/issues/1447), thanks [**vincascm**](https://github.com/vincascm))
> 
>     ```rust
>     #[derive(Serialize, Deserialize)]
>     #[serde(rename_all(
>         serialize = "camelCase",
>         deserialize = "SCREAMING_SNAKE_CASE",
>     ))]
>     struct S { /* ... */ }
>     ```
> 
> - Allow serializing struct name inside of structs with named fields ([#1448](https://github-redirect.dependabot.com/serde-rs/serde/issues/1448), thanks [**motu42**](https://github.com/motu42))
> 
>     ```rust
>     #[derive(Serialize)]
>     #[serde(tag = "type")]
>     struct S { /* ... */ }  // serializes as {"type":"S",...}
>     ```
</details>
<details>
<summary>Commits</summary>

- [`b1b9702`](b1b9702daf) Release 1.0.83
- [`32728d2`](32728d2f1d) Format with rustfmt 2018-12-10
- [`807a097`](807a097387) Fix spelling in ui test name
- [`794ee15`](794ee15386) Merge pull request [#1448](https://github-redirect.dependabot.com/serde-rs/serde/issues/1448) from motu42/master
- [`2359417`](2359417804) Added ui tests, Limited serde(tag = "...") to structs with named field
- [`7950f3c`](7950f3cdc5) Format with rustfmt 2018-12-10
- [`b87f8f3`](b87f8f35ee) Merge pull request 1447 from vincascm/master
- [`9e53405`](9e53405f43) Fix for rustc 1.15.0
- [`c6c1d8f`](c6c1d8fa86) Work around deprecation of str::trim_left_matches
- [`8aa5c2b`](8aa5c2b45d) Removed deprected ui/enum-representation/internally-tagged-struct test
- Additional commits viewable in [compare view](https://github.com/serde-rs/serde/compare/v1.0.82...v1.0.83)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=serde&package-manager=cargo&previous-version=1.0.82&new-version=1.0.83)](https://dependabot.com/compatibility-score.html?dependency-name=serde&package-manager=cargo&previous-version=1.0.82&new-version=1.0.83)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot[bot] <support@dependabot.com>
2018-12-28 07:11:54 +00:00
dependabot[bot]
626badc30a
Bump serde from 1.0.82 to 1.0.83
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.82 to 1.0.83.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.82...v1.0.83)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-28 06:08:30 +00:00