aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-094-281/+304
|\ | | | | | | feature/themes
| * Merge #2196bors[bot]2019-11-084-281/+304
| |\ | | | | | | | | | | | | | | | | | | | | | 2196: Touch up nameres doc comment r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * Touch up nameres doc commentAleksey Kladov2019-11-081-7/+6
| | |
| | * Reduce visibilityAleksey Kladov2019-11-081-9/+9
| | |
| | * Extract path resolution submoduleAleksey Kladov2019-11-083-243/+269
| | |
| | * SimplifyAleksey Kladov2019-11-082-7/+5
| | | | | | | | | | | | | | | There's only one call-site for the function, so it seems fine to inline
| | * Reduce visibilityAleksey Kladov2019-11-081-23/+23
| |/
* | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-073-61/+66
|\| | | | | | | feature/themes
| * Merge #2194bors[bot]2019-11-073-61/+66
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2194: Update crates r=matklad a=kjeremy Removes nodrop and extra arrayvec We have an extra crossbeam-queue and crossbeam-utils left but those should drop once rayon accepts https://github.com/rayon-rs/rayon/pull/704 Co-authored-by: kjeremy <[email protected]>
| | * Update crateskjeremy2019-11-073-61/+66
| |/ | | | | | | | | | | | | Removes nodrop and extra arrayvec We have an extra crossbeam-queue and crossbeam-utils left but those should drop once rayon accepts https://github.com/rayon-rs/rayon/pull/704
* | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-078-71/+177
|\| | | | | | | feature/themes
| * Merge #2193bors[bot]2019-11-071-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | 2193: cargo xtask format with rust 1.39 r=matklad a=kjeremy Needed to pass tests on latest stable Co-authored-by: kjeremy <[email protected]>
| | * cargo xtask format with 1.39kjeremy2019-11-071-3/+3
| |/
| * Merge #2179bors[bot]2019-11-065-14/+111
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2179: Use HirDatabase to compute `is_deprecated` r=matklad a=martskins This PR fixes #2167 by introducing `attributes_query` and adding `fn attrs(&self, def: crate::AttrDef) -> Option<Arc<[Attr]>>;` to the `DefDatabase` trait. I'm a little concerned about the two spots in `attributes_query` where code is repeated, but I couldn't figure out a way to avoid that, so.. I welcome suggestions :smile: Co-authored-by: Martin Asquino <[email protected]>
| | * HirDatabase stored attributesMartin Asquino2019-11-045-14/+111
| | |
| * | Merge #2191bors[bot]2019-11-061-52/+57
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2191: Cleanup complete_postfix r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Cleanup complete_postfixAleksey Kladov2019-11-061-52/+57
| |/ /
| * | Merge #2188bors[bot]2019-11-061-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2188: Ignore line-endings when checking generated files for freshness r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Ignore line-endings when checking generated files for freshnessAleksey Kladov2019-11-061-2/+6
| |/ / | | | | | | | | | closes #2184
* | | Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into ↵Seivan Heidari2019-11-051-12/+21
|\| | | | | | | | | | | feature/themes
| * | Merge #2187bors[bot]2019-11-051-12/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2187: Update smallvec to avoid UB and cc while we're at it r=kjeremy a=kjeremy See: https://github.com/servo/rust-smallvec/releases/tag/v0.6.13 Co-authored-by: kjeremy <[email protected]>
| | * | Update smallvec to avoid UB and cc while we're at itkjeremy2019-11-051-12/+21
| |/ /
* | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-052-11/+11
|\| |
| * | Merge #2185bors[bot]2019-11-052-11/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2185: Bump psm, console, indicatif r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| | * | Bump psm, console, indicatifkjeremy2019-11-052-11/+11
| |/ /
* | | See if this satisfies the CI.Seivan Heidari2019-11-051-5/+5
| | |
* | | Fix typo.Seivan Heidari2019-11-041-1/+1
| | |
* | | Clearer docs usage under `rust-analyzer.scopeMappings`.Seivan Heidari2019-11-041-1/+1
| | |
* | | Remove new line.Seivan Heidari2019-11-041-1/+0
| | |
* | | Logging fallback tag in case scopes are missing.Seivan Heidari2019-11-041-3/+5
| | |
* | | Merge branch 'master' into feature/themesSeivan Heidari2019-11-0420-342/+323
|\| |
| * | Merge #2177bors[bot]2019-11-041-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2177: Reduce visibility r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Reduce visibilityAleksey Kladov2019-11-041-2/+2
| |/ /
| * | Merge #2176bors[bot]2019-11-049-26/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2176: Move Namespace enum closer to usage r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Move Namespace enum closer to usageAleksey Kladov2019-11-049-26/+29
| | | |
| * | | Merge #2175bors[bot]2019-11-048-306/+212
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2175: Appease the linter by dummy doc comments r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Appease the linter by dummy doc commentsAleksey Kladov2019-11-042-1/+3
| | | |
| | * | SimplifyAleksey Kladov2019-11-041-35/+24
| | | |
| | * | Restore assists testsAleksey Kladov2019-11-043-4/+50
| | | |
| | * | Rename MockDatabase -> TestDBAleksey Kladov2019-11-046-60/+57
| | | | | | | | | | | | | | | | Actually working rename is sooo useful!
| | * | remove dead codeAleksey Kladov2019-11-041-26/+7
| | | |
| | * | Remove more duplication in test fixturesAleksey Kladov2019-11-045-62/+18
| | | |
| | * | Remove some duplicated test functionsAleksey Kladov2019-11-041-81/+16
| | | |
| * | | Merge #2174bors[bot]2019-11-042-6/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2174: Reduce visibility r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| | * | Reduce visibilityAleksey Kladov2019-11-042-6/+10
| |/ /
| * | Merge #2173bors[bot]2019-11-042-2/+70
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2173: MBE: Add TokenId shift in macro_rules r=matklad a=edwin0cheng As discussed in #2169 , for fixing duplication TokenId during expansion : > What we can do here is to re-number the tokens during expansion. Specifically: > * when we create macro_rules, we note the highest id of the token we have as shift> > * when we expand macro rules, if we need to output a token from definition, we just re-use its id > * if we need to output a token from the argument, we increase its id by shift (so it's guaranteed to not to collide with anything from the definition) > * finally, when we have a HirFileId of the expansion, we can look up the original value of shift and classify node to the arg/def by comparing it's id with shift. > This PR implement first 3 points of above solution. Co-authored-by: Edwin Cheng <[email protected]>
| | * Change to add 1 if non zero shiftEdwin Cheng2019-11-041-1/+1
| | |
| | * Refactor and renameEdwin Cheng2019-11-041-21/+20
| | |
| | * Change Option<u32> to u32 for shift valueEdwin Cheng2019-11-041-8/+5
| | |
| | * Change to better namingEdwin Cheng2019-11-041-3/+3
| | |