aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge #1241bors[bot]2019-05-041-89/+131
|\ | | | | | | | | | | | | | | 1241: :arrow_up: deps r=matklad a=matklad bors r+ Co-authored-by: Aleksey Kladov <[email protected]>
| * :arrow_up: depsAleksey Kladov2019-05-041-89/+131
|/
* Merge #1208bors[bot]2019-05-049-6/+97
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1208: [WIP] Goto for Macro's r=matklad a=Lapz Adds goto definition for macros. Currently only works for macros in the current crate ~~otherwise it panics~~. Proper macro resolution needs to be added for it to resolve macros in other crates. Todo - [X] Allow goto from macro calls - [X] Fix panics - [x] Add tests ![Screen Recording 2019-04-25 at 18 00 24](https://user-images.githubusercontent.com/19998186/56754499-1dd01c00-6785-11e9-9e9a-1e36de70cfa3.gif) Co-authored-by: Lenard Pratt <[email protected]>
| * Added local macro gotoLenard Pratt2019-05-049-6/+97
| |
* | Merge #1216bors[bot]2019-05-0417-280/+1027
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1216: Basic Chalk integration r=matklad a=flodiebold This replaces the ad-hoc `implements` check by Chalk. It doesn't yet any new functionality (e.g. where clauses aren't passed to Chalk yet). The tests that exist actually work, but it needs some refactoring, currently crashes when running analysis on the RA repo, and depends on rust-lang/chalk#216 which isn't merged yet :smile: The main work here is converting stuff back and forth and providing Chalk with the information it needs, and the canonicalization logic. Since canonicalization depends a lot on the inference table, I don't think we can currently reuse the logic from Chalk, so we need to implement it ourselves; it's not actually that complicated anyway ;) I realized that we need a `Ty::Bound` variant separate from `Ty::Param` -- these are two different things, and I think type parameters inside a function actually need to be represented in Chalk as `Placeholder` types. ~~Currently this crashes in the 'real' world because we don't yet do canonicalization when filtering method candidates. Proper canonicalization needs the inference table (to collapse different inference variables that have already been unified), but we need to be able to call the method candidate selection from the completion code... So I'm currently thinking how to best handle that :smile:~~ Co-authored-by: Florian Diebold <[email protected]>
| * | Differentiate Tuple / FnPtr type constructors by cardinalityFlorian Diebold2019-05-045-15/+25
| | | | | | | | | | | | | | | This is necessary because Chalk (reasonably) expects each 'struct' to know how many type parameters it takes.
| * | Simplify subst / subst_bound_vars a bitFlorian Diebold2019-05-041-12/+2
| | |
| * | Handle recursive types in canonicalizationFlorian Diebold2019-05-043-5/+15
| | |
| * | Remove ToChalk implementation for ApplicationTyFlorian Diebold2019-05-041-29/+16
| | |
| * | Make canonicalization API a bit nicerFlorian Diebold2019-05-042-31/+56
| | |
| * | Update ChalkFlorian Diebold2019-05-044-34/+39
| | |
| * | Turn eprintln!s into debug!sFlorian Diebold2019-05-042-8/+12
| | |
| * | Handle Ty::Unknown in Chalk conversionFlorian Diebold2019-05-041-1/+5
| | | | | | | | | | | | Badly, but at least it doesn't crash.
| * | Canonicalize before doing method resolutionFlorian Diebold2019-05-047-133/+165
| | |
| * | Document the peculiarity of the solver query a bitFlorian Diebold2019-05-042-3/+10
| | | | | | | | | | | | | | | Also remove the only remaining mention of chalk outside of the ty::traits module.
| * | Move Chalk conversion code to its own moduleFlorian Diebold2019-05-043-321/+339
| | |
| * | Implement Deref<Target=[Ty]> for SubstsFlorian Diebold2019-05-042-18/+18
| | |
| * | Simplify solution_from_chalkFlorian Diebold2019-05-041-12/+11
| | |
| * | Chalk integrationFlorian Diebold2019-05-0414-147/+798
| | | | | | | | | | | | | | | - add proper canonicalization logic - add conversions from/to Chalk IR
| * | Add Ty::Bound variant for use in Chalk integrationFlorian Diebold2019-05-041-2/+7
| | |
* | | Merge #1239bors[bot]2019-05-041-3/+24
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 1239: Fix `$true` and `$false` as $var name error r=matklad a=edwin0cheng This PR fixed a bug which cannot use `$true` and `$false` as `$var` name in mbe. Co-authored-by: Edwin Cheng <[email protected]>
| * | Fix `$true` and `$false` as $var name errorEdwin Cheng2019-05-041-3/+24
|/ /
* | Merge #1238bors[bot]2019-05-045-69/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1238: Macro queries r=edwin0cheng a=matklad In https://github.com/rust-analyzer/rust-analyzer/pull/1231, I've added aggressive clean up of `ast_id_to_node` query. The result of this query is a `SyntaxTree`, and we don't want to retain syntax trees in memory unless absolutely necessary. Moreover, `SyntaxTree` has identity equality semantics, meaning that we'll get a diffferent syntax tree for a file after every reparse. That means that `ast_id_to_node` query should not genereally be used in HIR, unless it is behind some kind of salsa firewall, like the `raw` module of name resoulution. However, that PR resulted in the abysmal performance: turns out we were using ast_id_to_node quite heavily in hir when expanding macros! So this PR installs the more incremental-friendly query structure: * converting source to token tree is now a query; changing source without affecting token-trees will now preserve macro expansions * expand macro (tt -> tt) is now a query as well, so we cache macro expansions *before* parsing them into item lists or expressions, which is nice: we can cache expansion without knowing the calling context! r? @edwin0cheng Co-authored-by: Aleksey Kladov <[email protected]>
| * | make macro expansion into a proper queryAleksey Kladov2019-05-043-35/+28
| | |
| * | minor, moveAleksey Kladov2019-05-041-19/+19
| | |
| * | introduce macro_arg intermediate queryAleksey Kladov2019-05-043-25/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when expanding macros, we look at the source code directly (we invoke ast_id_to_node query via to_node method). This is less then ideal, because it make us re-expand macros after every source change. This commit establishes a salsa-firewall: a query to get macro call's token tree. Unlike the syntax tree, token tree changes only if we actually modify the macro itself.
| * | Revert "eagarly clean astd maps"Aleksey Kladov2019-05-043-3/+3
| | | | | | | | | | | | | | | | | | This reverts commit 6c63a59425e256ce46d058807b64149297231982. This causes massive slowdowns: looks like we accidentally have some source-depndent
* | | Merge #1237bors[bot]2019-05-041-3/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 1237: Improve $ Handling in mbe parser r=matklad a=edwin0cheng This PR improve the $ handling in mbe parser. In some rare case, the `$` may not be following an `ident` or a `Subtree`. ( For example, a macro_rules inside a macro rules). Related issue: #1236 Co-authored-by: Edwin Cheng <[email protected]>
| * | Add testEdwin Cheng2019-05-041-0/+2
| | |
| * | Error out when parse_subtree is not a subtreeEdwin Cheng2019-05-041-3/+6
|/ /
* | Merge #1235bors[bot]2019-05-041-6/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | 1235: revert eagarly clean astd maps r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | revert eagarly clean astd mapsAleksey Kladov2019-05-041-6/+1
| | | | | | | | | | | | This causes massive slowdown :-(
* | | Merge #1230bors[bot]2019-05-042-3/+95
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 1230: Desugar doc comments to `#[doc = "...."]` attributes in `syntax node` to tt conversion r=matklad a=edwin0cheng As discussed in [Zulip](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/MBE.20discussion/near/164446835), this PR desugar doc comments to `#[doc = "...."]` in `syntax node` to tt conversion. Note that after this PR, all obvious mbe bugs in dogfooding are fixed. (i.e. No parsing or expanding mbe error in `env RUST_LOG=ra_hir=WARN target\release\ra_cli.exe analysis-stats`) 🎉 Co-authored-by: Edwin Cheng <[email protected]>
| * | Quote the quoted commentEdwin Cheng2019-05-042-2/+2
| | |
| * | Use explict `escape_default` instead of dbg printEdwin Cheng2019-05-041-1/+1
| | |
| * | Convert doc comment to attrEdwin Cheng2019-05-042-3/+95
| | |
* | | Merge #1231bors[bot]2019-05-044-3/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 1231: eagarly clean astd maps r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | eagarly clean astd mapsAleksey Kladov2019-05-044-3/+9
|/ /
* | Merge #1229bors[bot]2019-05-032-13/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1229: Mark unused mbe variable as `Binding::Empty` r=matklad a=edwin0cheng This PR fixes a regression bug in In #1228, which incorrect expand an empty binding : * Introduce a new Binding type `Binding::Empty`. * Mark all unused binding variables are empty and error out in expansion instead of just by passing. Co-authored-by: Edwin Cheng <[email protected]>
| * | Mark unused mbe variable as `Binding::Empty`Edwin Cheng2019-05-032-13/+61
|/ /
* | Merge #1228bors[bot]2019-05-033-1142/+1409
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1228: Add inner macro checker in mbe r=matklad a=edwin0cheng This PR do the following things: * Add an inner macro checker for allowing defining mbe in mbe. (It is a adhoc solution, we could eliminate it after we have a better mbe parser) * Move all tests to an tests modules * Filter empty tree while expanding mbe. This is the final PR extracting from #1219 Co-authored-by: Edwin Cheng <[email protected]>
| * | By pass unbind $var while mbe expandingEdwin Cheng2019-05-033-7/+39
| | |
| * | Refactor out tests module and remove empty subtreeEdwin Cheng2019-05-033-1137/+1372
|/ /
* | Merge #1227bors[bot]2019-05-033-1/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | 1227: Add `default_type` method in `TypeParam` Node r=matklad a=edwin0cheng This PR add a `default_type` method in `TypeParam` Node which allow future PR to handle #1099 case. Co-authored-by: Edwin Cheng <[email protected]>
| * | Add default type param in TypeParam NodeEdwin Cheng2019-05-033-1/+8
| | |
* | | Merge #1226bors[bot]2019-05-032-24/+43
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1226: Fix Bug in mbe on mismatching bindings count r=matklad a=edwin0cheng This PR do the followings things: 1. Fixed a bug happened in following code by inserting empty bindings before a nested bindings: ``` macro_rules foo! { ($( ($($a:ident)* => $($b:ident))*))* => { ... } } foo!( ( => a) (b => ) ) ``` 2. Fixed a bug which forget to restore `var_expanded`. 3. Some cleanup Co-authored-by: Edwin Cheng <[email protected]>
| * | Fixed old incorrect testEdwin Cheng2019-05-021-1/+1
| | |
| * | Fix typoEdwin Cheng2019-05-021-3/+3
| | |
| * | Compare text insteadEdwin Cheng2019-05-021-2/+2
| | |
| * | Add empty bindings and some refactoringEdwin Cheng2019-05-022-22/+41
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:36:25 +0000