aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #7386bors[bot]2021-01-222-1/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7386: Handle box with allocator r=flodiebold a=tweksteen In 1.49.0, the definition of Box was modified to support an optional Allocator[1]. Adapt the parsing of the `box` keyword to supply the expected number of parameters to the constructor. [1] https://github.com/rust-lang/rust/commit/f288cd2e179f600fa00c2a407206a12f6c5a91e0 Fixes: #6956 Co-authored-by: Thiébaud Weksteen <[email protected]>
| * Handle box with allocatorThiébaud Weksteen2021-01-222-1/+28
| | | | | | | | | | | | | | | | In 1.49.0, the definition of Box was modified to support an optional Allocator[1]. Adapt the parsing of the `box` keyword to supply the expected number of parameters to the constructor. [1] https://github.com/rust-lang/rust/commit/f288cd2e179f600fa00c2a407206a12f6c5a91e0
* | Merge #7390bors[bot]2021-01-221-0/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 7390: Style: use the right string r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | Style: use the right stringAleksey Kladov2021-01-221-0/+12
| | |
* | | Merge #7348bors[bot]2021-01-224-3/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7348: Fix broken link in intra-doc r=edwin0cheng a=sasurau4 Fix #5546 The intra-doc link doesn't work fine for trait associated method. Co-authored-by: Daiki Ihara <[email protected]>
| * | | Fix broken link in intra-docDaiki Ihara2021-01-224-3/+68
| | | |
* | | | Merge #7389bors[bot]2021-01-221-60/+30
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 7389: Remove approximate goto def r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Cleanup testsAleksey Kladov2021-01-221-12/+12
| | | |
| * | | Remove index based fallback for goto defAleksey Kladov2021-01-221-48/+18
| | | | | | | | | | | | | | | | | | | | We are so precise that the fallback creates more confusion, when you can goto def on an unresolved reference.
* | | | Merge #7388bors[bot]2021-01-221-3/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 7388: Minor fix for #7387 r=edwin0cheng a=edwin0cheng bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * | | Use AbsPathEdwin Cheng2021-01-221-3/+3
|/ / /
* | | Merge #7387bors[bot]2021-01-224-196/+228
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 7387: Refactor build script specific data r=edwin0cheng a=edwin0cheng It refactors for separating logic for build script specific data. bors r+ Co-authored-by: Edwin Cheng <[email protected]>
| * | Refactor build script dataEdwin Cheng2021-01-224-196/+228
| | |
* | | Merge #7384bors[bot]2021-01-211-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7384: Remove unused field r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | | Remove unused fieldJonas Schievink2021-01-211-4/+0
|/ / /
* | | Merge #7383bors[bot]2021-01-211-8/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7383: Add test for path resolution bug r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | | Add test for path resolution bugJonas Schievink2021-01-211-8/+33
|/ / /
* | | Merge #7382bors[bot]2021-01-211-14/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 7382: Cargo update r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | Cargo updatekjeremy2021-01-211-14/+17
|/ /
* | Merge #7381bors[bot]2021-01-213-19/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 7381: Revert "Make use of `block_def_map` in body lowering" r=jonas-schievink a=jonas-schievink Reverts rust-analyzer/rust-analyzer#7380, since it broke stuff bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Revert "Make use of `block_def_map` in body lowering"Jonas Schievink2021-01-213-19/+18
|/ /
* | Merge #7378bors[bot]2021-01-219-4/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | 7378: Include `countme` crate to count important data structures. r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
| * | Include `countme` crate to count important data structures.Aleksey Kladov2021-01-219-4/+58
| | |
* | | Merge #7380bors[bot]2021-01-213-18/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7380: Make use of `block_def_map` in body lowering r=jonas-schievink a=jonas-schievink Removes the `local_scope` argument from `Expander` in favor of tracking the `DefMap` in use during body lowering. For now, we still collect inner items as usual, because other code still relies on `item_scope`. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | | Make use of `block_def_map` in body loweringJonas Schievink2021-01-213-18/+19
|/ / / | | | | | | | | | | | | Removes the `local_scope` hack from `Expander` in favor of tracking the `DefMap` in use during body lowering
* | | Merge #7377bors[bot]2021-01-211-4/+0
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 7377: Remove unnecessary annotations from tests r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Remove unnecessary annotations from testsJonas Schievink2021-01-211-4/+0
|/ /
* | Merge #7376bors[bot]2021-01-211-0/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | 7376: Add test for nameres in nested blocks r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Add test for nameres in nested blocksJonas Schievink2021-01-211-0/+29
|/ /
* | Merge #7375bors[bot]2021-01-2110-58/+291
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7375: Add support for running name resolution in block expressions r=jonas-schievink a=jonas-schievink This adds a `block_def_map` query that runs the name resolution algorithm on a block expression, and returns a `DefMap` that stores links to the parent `DefMap` (either the containing block or the crate-level `DefMap`). Blocks with no inner items return the parent's `DefMap` as-is, to avoid creating unnecessarily long `DefMap` chains. Path resolution is updated to recurse into the parent `DefMap` after looking up a path in the original `DefMap`. I've added a few new tests for this, but outside of those this isn't used yet. bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | Add test that merges inner and outer namesJonas Schievink2021-01-211-0/+25
| | |
| * | Fix lowering with multiple block expressionsJonas Schievink2021-01-211-15/+23
| | |
| * | Fall back to parent DefMaps when resolving pathsJonas Schievink2021-01-211-0/+37
| | |
| * | Add name resolution query for block expressionsJonas Schievink2021-01-218-43/+206
| | |
* | | Merge #7372bors[bot]2021-01-212-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7372: Up lexer r=kjeremy a=kjeremy No real changes here. Co-authored-by: kjeremy <[email protected]>
| * | | Up lexerkjeremy2021-01-212-3/+3
| |/ /
* | | Merge #7371bors[bot]2021-01-211-0/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 7371: Change directory before running rustfmt to respect rustfmt.toml r=matklad a=lnicola Fixes #6973 Co-authored-by: Laurențiu Nicola <[email protected]>
| * | chdir to file before rustfmtLaurențiu Nicola2021-01-211-0/+17
| | |
* | | Merge #7370bors[bot]2021-01-215-6/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7370: fix mega bug r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
| * | | Fix mega bugAleksey Kladov2021-01-215-6/+10
|/ / / | | | | | | | | | https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Fwg-rls-2.2E0/topic/Manual.20content.20is.20duplicated
* | | Merge #7368bors[bot]2021-01-212-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7368: Clarify enabled features and defined features in PackageData r=matklad a=edwin0cheng Co-authored-by: Edwin Cheng <[email protected]>
| * | | Added defined_features in PackageDataEdwin Cheng2021-01-212-5/+8
| |/ /
* | | Merge #7367bors[bot]2021-01-212-11/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 7367: Bump chalk r=lnicola a=lnicola Fixes #6945 Fixes #6812 bors r+ Co-authored-by: Laurențiu Nicola <[email protected]>
| * | Bump chalkLaurențiu Nicola2021-01-212-11/+11
|/ /
* | Merge #7366bors[bot]2021-01-208-7/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | 7366: Treat BlockExpr as a potential module origin r=jonas-schievink a=jonas-schievink A block containing inner items acts like the root module of a crate, so it needs to be representable as a `ModuleSource` and `ModuleOrigin`. Co-authored-by: Jonas Schievink <[email protected]>
| * | Treat BlockExpr as a potential module originJonas Schievink2021-01-208-7/+44
|/ /
* | Merge #7365bors[bot]2021-01-202-11/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | 7365: chalk 0.49.0 r=kjeremy a=kjeremy Co-authored-by: kjeremy <[email protected]>
| * | chalk 0.49.0kjeremy2021-01-202-11/+11
| | |
* | | Merge #7364bors[bot]2021-01-204-11/+23
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 7364: DefMap: hide remaining crate-visible fields r=jonas-schievink a=jonas-schievink bors r+ Co-authored-by: Jonas Schievink <[email protected]>
| * | DefMap: hide remaining crate-visible fieldsJonas Schievink2021-01-204-11/+23
|/ /