Skip to content

Convert rust-analyzer to an in-tree tool #99603

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.

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

Merged
merged 10,000 commits into from
Jul 25, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
30680df
Auto merge of #12679 - a-kenji:fix-typos-hir, r=lnicola
bors Jul 2, 2022
d101439
Auto merge of #12627 - yue4u:fix/struct-variant-patterns, r=Veykril
bors Jul 2, 2022
afdbd6c
fix: infer lhs first on ordinary assignment expressions
lowr Jul 2, 2022
649e1f5
fix: report type mismatch on identifier in destructuring assignments
lowr Jul 2, 2022
d1ac462
Auto merge of #12680 - lowr:fix/12428-regression, r=Veykril
bors Jul 2, 2022
0039d6f
fix: Extract Function produces duplicate fn names
DorianListens Jun 30, 2022
cc0bb71
Auto merge of #12662 - DorianListens:dscheidt/extract-function-duplic…
bors Jul 2, 2022
e394000
fix: Extract function from trait impl
DorianListens Jul 1, 2022
212f84a
Bump crossbeam-channel
lnicola Jul 2, 2022
416787d
Bump anyhow
lnicola Jul 2, 2022
c7c314d
Bump quote
lnicola Jul 2, 2022
e6fcb23
Bump either
lnicola Jul 3, 2022
2af61bc
Bump pulldown-cmark-to-cmark
lnicola Jul 3, 2022
791f2a0
Bump smallvec
lnicola Jul 3, 2022
87572be
Bump serde
lnicola Jul 3, 2022
b24ece5
Bump serde_json
lnicola Jul 3, 2022
6669f38
Bump indexmap
lnicola Jul 3, 2022
2d3f0b4
Bump semver
lnicola Jul 3, 2022
9e7ca80
Bump cargo_metadata
lnicola Jul 3, 2022
a3011e5
Bump arbitrary and derive_arbitrary
lnicola Jul 3, 2022
5381811
Bump tracing-subscriber
lnicola Jul 3, 2022
e05e6c6
Bump object
lnicola Jul 3, 2022
78beb4c
Bump chalk
lnicola Jul 3, 2022
993a19a
Bump the rest of the deps
lnicola Jul 3, 2022
75b2232
Auto merge of #12681 - lnicola:bump-deps, r=lnicola
bors Jul 3, 2022
ccf854b
Improve documentation for buildScripts.overrideCommand / checkOnSave.…
flodiebold Jul 4, 2022
5235732
Add back restartServerOnConfigChange option
flodiebold Jul 4, 2022
e1a8c0b
Auto merge of #12687 - flodiebold:override-docs, r=flodiebold
bors Jul 4, 2022
db49ac8
internal: Record all macro definitions in ItemScope
Veykril Jul 5, 2022
383ee6a
internal: Update inert attribute list
Veykril Jul 5, 2022
6edf624
Auto merge of #12690 - Veykril:inert-attrs, r=Veykril
bors Jul 5, 2022
976d07e
fix: Fix unresolved proc macro diagnostics pointing to macro expansions
Veykril Jul 5, 2022
2926ca0
Remove useless bors.toml
Rustin170506 Jul 5, 2022
0d9737a
Fix project root assert
Rustin170506 Jul 5, 2022
441e659
Complete associated type only in trait generic arg
xuhongxu96 Jul 5, 2022
fee5555
Auto merge of #12694 - hi-rustin:rustin-patch-bors, r=jonas-schievink
bors Jul 5, 2022
b9ba9fa
Add str_ref_to_string fix
Rustin170506 Jul 5, 2022
0f2eba5
Show only assoc type args in the correct arg pos
xuhongxu96 Jul 6, 2022
ad5a851
Code: use different schemes for the custom views
lnicola Jul 6, 2022
00194ad
Auto merge of #12702 - lnicola:vscode-schemes, r=lnicola
bors Jul 6, 2022
75fb3de
Handle generic args per arg index
xuhongxu96 Jul 6, 2022
0360ed5
check arg_idx >= n_params only if arg_idx >= n_required_params
xuhongxu96 Jul 6, 2022
d2fd137
Use `SmallVec` to slightly shrink `ModPath` size
Jul 6, 2022
c46570e
Auto merge of #12704 - jonas-schievink:smol-paths, r=jonas-schievink
bors Jul 6, 2022
3248601
fix default type param value position
xuhongxu96 Jul 6, 2022
c296e77
Auto merge of #12695 - xuhongxu96:fix-12140, r=jonas-schievink
bors Jul 6, 2022
f0af913
publish workflow: Fix names for existing crates
davidlattimore Jul 8, 2022
6f819e3
Remove unnecessary unsafe from format_args expansion
davidlattimore Jul 8, 2022
09abd76
Auto merge of #12716 - davidlattimore:fix-publish-crate-names, r=lnicola
bors Jul 8, 2022
6c6ae96
Update remaining GitHub URLs
Jul 8, 2022
df4ed94
Auto merge of #12722 - jonas-schievink:update-urls, r=jonas-schievink
bors Jul 8, 2022
7181a39
Auto merge of #12676 - DorianListens:dscheidt/extract-fun-trait-impl,…
bors Jul 8, 2022
c419aa9
Auto merge of #12719 - davidlattimore:format-args-no-unsafe, r=jonas-…
bors Jul 8, 2022
603b6fc
fix: Extract Function misses locals used in closures
DorianListens Jul 6, 2022
2836dd1
Auto merge of #12706 - DorianListens:dscheidt/closure-args, r=DorianL…
bors Jul 8, 2022
21062f9
fix: Improve suggested names for extracted variables
DorianListens Jul 8, 2022
638abba
Fix test
Rustin170506 Jul 9, 2022
666343b
Auto merge of #12727 - DorianListens:dscheidt/extract-var-field-name,…
bors Jul 9, 2022
03a62c1
Bump vscode-languageclient
lnicola Jul 9, 2022
b43708c
Bump d3 and d3-graphviz
lnicola Jul 9, 2022
1b138b1
Bump esbuild
lnicola Jul 9, 2022
7b1b711
Bump eslint
lnicola Jul 9, 2022
0e38961
Bump vsce
lnicola Jul 9, 2022
d03ed83
Bump @typescript-eslint
lnicola Jul 9, 2022
8e889ac
Bump prettier
lnicola Jul 9, 2022
2c9e395
Bump typescript and tslib
lnicola Jul 9, 2022
358d6c6
Bump @types/node to 16
lnicola Jul 9, 2022
a059e79
Bump @vscode/test-electron
lnicola Jul 9, 2022
cb38145
Bump transitive npm deps
lnicola Jul 9, 2022
5342f47
Auto merge of #12732 - lnicola:bump-npm, r=lnicola
bors Jul 9, 2022
4b3164f
fix: ignore renames for crate root
harpsword Jul 7, 2022
eaebead
Fix config keys regarding imports in docs
TonalidadeHidrica Jul 11, 2022
6e55716
Fix obsolete `loadOutDirsFromCheck` configs
TonalidadeHidrica Jul 11, 2022
195ceea
Fix obsolete `diagnostics.experimental.enable`
TonalidadeHidrica Jul 11, 2022
f0649f2
Fix `rustcSource` -> `rustc_source`
TonalidadeHidrica Jul 11, 2022
dfcbed0
Fix obsolete `enableRangeFormatting` config
TonalidadeHidrica Jul 11, 2022
e3bde57
Fix obsolete `completion.snippets` config
TonalidadeHidrica Jul 11, 2022
d9ab7f2
Fix typos
Rustin170506 Jul 11, 2022
f7bb932
Auto merge of #12744 - hi-rustin:rustin-patch-typos, r=lnicola
bors Jul 11, 2022
df66eb7
Implement `ignore` and `index` metavar expression
Jul 11, 2022
caf23f2
Auto merge of #12745 - jonas-schievink:metavar-exprs, r=jonas-schievink
bors Jul 11, 2022
ebfbb31
Update 1.63 proc macro ABI to match rustc
Jul 12, 2022
4cbf23c
Auto merge of #12747 - jonas-schievink:proc-macro-abi-1.63, r=jonas-s…
bors Jul 12, 2022
84a6bc9
Auto merge of #12742 - TonalidadeHidrica:fix-obsolete-config-keys, r=…
bors Jul 13, 2022
fc47ce5
Auto merge of #12696 - hi-rustin:rustin-patch-fix, r=Veykril
bors Jul 13, 2022
def89af
fix: Fix VSCode status bar tooltip not showing the error messages
Veykril Jul 13, 2022
90b5097
Auto merge of #12754 - Veykril:vscode-status, r=Veykril
bors Jul 13, 2022
ec51dcb
fix: Set server binary version when distributing
Veykril Jul 13, 2022
794ecd5
Auto merge of #12755 - Veykril:server-version, r=lnicola
bors Jul 13, 2022
a5ad4de
add tests
soruh Jul 13, 2022
075ab03
fix: Support generics in extract_function assist
DorianListens Apr 30, 2022
796641b
Make search for applicable generics more precise
DorianListens Jul 13, 2022
4cbde4e
fix(completion): `super::` completion at crate root and module depth
feniljain Jul 10, 2022
5af3ef5
Auto merge of #12735 - feniljain:fix-completions, r=feniljain
bors Jul 14, 2022
fbba1d7
Auto merge of #12691 - Veykril:proc-macro-diag, r=Veykril
bors Jul 14, 2022
073b325
Auto merge of #12556 - DorianListens:dscheidt/generic-extract, r=Veykril
bors Jul 14, 2022
6b823b0
fix: Fix imports being inserted before doc comments in inline modules
Veykril Jul 14, 2022
029184d
Auto merge of #12765 - Veykril:import-insert-fix, r=Veykril
bors Jul 14, 2022
7ff6c36
fix: Don't show qualified path completions for private items
Veykril Jul 14, 2022
f4fe2ea
Remove deprecate action
matklad Jul 14, 2022
248fa55
Update .github/workflows/release.yaml
matklad Jul 14, 2022
b49f2a2
Remove deprecate action
matklad Jul 14, 2022
4ad9185
Auto merge of #12764 - matklad:rustupaction, r=lnicola
bors Jul 16, 2022
25090f0
internal: Remove allocation in DefCollector::reseed_with_unresolved_a…
Veykril Jul 16, 2022
2e9d5b5
Auto merge of #12766 - Veykril:completion-vis, r=Veykril
bors Jul 16, 2022
d3796ad
Auto merge of #12772 - Veykril:nameres, r=Veykril
bors Jul 16, 2022
b96f8f1
fix: Improve self param completion applicability
Veykril Jul 16, 2022
96481b7
Auto merge of #12773 - Veykril:self-compl, r=Veykril
bors Jul 16, 2022
c205c62
try fixing spurious CI failures on windows
matklad Jul 16, 2022
f2c2c36
Auto merge of #12776 - matklad:nosu, r=matklad
bors Jul 16, 2022
0a4065d
Improve syntax fixup a bit, handle incomplete `if`
flodiebold Jul 16, 2022
3d7da51
Auto merge of #12775 - flodiebold:syntax-fixup-if, r=flodiebold
bors Jul 16, 2022
ac526e0
Auto merge of #12712 - harpsword:fix-rename-crate-root, r=Veykril
bors Jul 16, 2022
01d2517
Auto merge of #12539 - soruh:instanciate_empty_structs, r=Veykril
bors Jul 16, 2022
766c5f0
Auto merge of #12689 - Veykril:macro-rec, r=Veykril
bors Jul 16, 2022
b9b42e8
tests: add hover tests for const generics
Logarithmus Jul 13, 2022
a96f0aa
feat: support negative const generic parameters
Logarithmus Jul 17, 2022
a0fd58b
Check for local IDs belong to same definition
iDawer Jul 17, 2022
667fd25
Auto merge of #12781 - iDawer:hir_display.stack_overflow, r=lnicola
bors Jul 17, 2022
15f7300
refactor: inline some variables
Logarithmus Jul 17, 2022
83177a7
fix: address suggestions
Logarithmus Jul 17, 2022
db6a85d
Auto merge of #12778 - Logarithmus:feature/fix-negative-const-generic…
bors Jul 17, 2022
d9336a4
fix: un-inline `ConstScalarOrPath::from_expr_opt`
Logarithmus Jul 17, 2022
897a7ec
Auto merge of #12785 - Logarithmus:feature/fix-negative-const-generic…
bors Jul 17, 2022
ea19e70
Fix extract variable assist for subexpression in mutable borrow
hasali19 Jul 17, 2022
b5aa3b3
fix: “Generate constant” ignores the path prefix of the identifier
harpsword May 1, 2022
8e379ce
Auto merge of #12286 - harpsword:fix_generate_constant, r=Veykril
bors Jul 18, 2022
6cb0746
Support the 1.64 nightly proc macro ABI
Jul 18, 2022
ee2d5fe
Auto merge of #12795 - jonas-schievink:proc-macro-abi-1.64, r=jonas-s…
bors Jul 18, 2022
be30c4d
chore: change str_ref_to_string to str_ref_to_owned
mmirate Jul 18, 2022
e2eaa99
Auto merge of #12788 - hasali19:extract-var-mut, r=jonas-schievink
bors Jul 18, 2022
5ad981b
Remove outdated proc macro ABIs
Jul 18, 2022
e01de19
Auto merge of #12798 - jonas-schievink:trim-proc-macro-abis, r=jonas-…
bors Jul 18, 2022
15016bc
Find original as node before compute ref match
Rustin170506 Jul 18, 2022
188c0e4
Remove macro ABI version from doc comment
Jul 18, 2022
ea41617
Auto merge of #12802 - rust-lang:jonas-schievink-patch-1, r=jonas-sch…
bors Jul 18, 2022
ec1142c
Improve file watcher config
Jul 18, 2022
38c11be
Move `convert_to_def_in_trait` into `ide-db`
Veykril Jul 18, 2022
22e53f1
Auto merge of #12549 - bitgaoshu:goto_where_trait_m_impl, r=Veykril
bors Jul 18, 2022
fac6a64
Auto merge of #12804 - jonas-schievink:config-watcher, r=Veykril
bors Jul 18, 2022
530eb27
Auto merge of #11819 - rust-lang:dependabot/npm_and_yarn/editors/code…
bors Jul 18, 2022
d17a5ef
Add simple support for completion item details
Veykril Jul 18, 2022
dc05192
Auto merge of #12807 - Veykril:completion-item-details, r=Veykril
bors Jul 18, 2022
ffb6b23
fix: Prevent panic in Remove Unused Parameter assist
DorianListens Jul 17, 2022
567a5e9
Auto merge of #12796 - mmirate:patch-1, r=Veykril
bors Jul 18, 2022
27b65ec
Add test case and token finder to address 12790
TopGunSnake Jul 19, 2022
3203cb1
Added coverage for trait, mod, impl, and enum cases.
TopGunSnake Jul 19, 2022
3cb78ff
Cleaned up trailing whitespace for tidy::files_are_tidy
TopGunSnake Jul 19, 2022
09da74a
Added case for const
TopGunSnake Jul 19, 2022
474f5ea
Work around Code bug with empty diagnostics
lnicola Jul 18, 2022
88515b9
Auto merge of #12809 - lnicola:empty-diagnostics, r=lnicola
bors Jul 19, 2022
1b41647
Upgrade to expect-test@1.4.0
fasterthanlime Jul 19, 2022
307be7c
Add CARGO_WORKSPACE_DIR env var in `.cargo/config.toml`
fasterthanlime Jul 19, 2022
7d20ff3
Auto merge of #12817 - fasterthanlime:expect-test-1-4-0, r=lnicola
bors Jul 19, 2022
30c4db1
Auto merge of #12789 - DorianListens:dscheidt/unused-param-overlappin…
bors Jul 19, 2022
6df414f
Inverted the match logic to skip comments, attribute macros, and whit…
TopGunSnake Jul 19, 2022
0e71356
Auto merge of #12800 - hi-rustin:rustin-patch-issue-12717, r=hi-rustin
bors Jul 20, 2022
1c32fcf
Fix generated `PartialEq::ne`
SpecialMike Jul 20, 2022
c001b9c
Auto merge of #12821 - SpecialMike:fix-partial-eq-default, r=Veykril
bors Jul 20, 2022
8454413
Auto merge of #12811 - TopGunSnake:12790, r=Veykril
bors Jul 20, 2022
cfc52ad
Add comments
lowr Jul 20, 2022
f3e9b38
Auto merge of #12646 - lowr:fix/11897, r=lowr
bors Jul 20, 2022
bb4bfae
fix: Fix search for associated trait items being inconsistent
Veykril Jul 20, 2022
0ded8e7
Auto merge of #12825 - Veykril:trait-assoc-search, r=Veykril
bors Jul 20, 2022
23d25a3
Enable extra warnings required by rust-lang/rust
fasterthanlime Jul 20, 2022
816f7fe
Run cargo fix --edition-idioms
fasterthanlime Jul 20, 2022
8318035
Fix last few warnings manually
fasterthanlime Jul 20, 2022
7e285e1
Run cargo fmt
fasterthanlime Jul 20, 2022
e507807
internal: Don't eagerly construct `AstIdMap`s
Veykril Jul 20, 2022
28bab68
Auto merge of #12826 - fasterthanlime:in-tree-warnings, r=Veykril
bors Jul 20, 2022
ade31ad
Rename proc macro server from 'Rustc' to 'RustAnalyzer'
fasterthanlime Jul 20, 2022
c520408
Allow merge commits when 'in-rust-tree' feature is enabled
fasterthanlime Jul 20, 2022
100ea1d
Auto merge of #12828 - fasterthanlime:proc-macro-srv-naming, r=Veykril
bors Jul 20, 2022
d5b1ae6
Remove check_merge_commits test altogether
fasterthanlime Jul 20, 2022
244f29b
Remove in-rust-tree feature
fasterthanlime Jul 20, 2022
bd4439f
Auto merge of #12829 - fasterthanlime:in-rust-tree-feature, r=Veykril
bors Jul 20, 2022
a88e088
Build proc-macro-test-impl out-of-tree
fasterthanlime Jul 20, 2022
4375cf3
proc-macro-test build script: wipe before, be more verbose
fasterthanlime Jul 20, 2022
898898d
Don't copy the Cargo.lock
fasterthanlime Jul 20, 2022
f504294
Add proc-macro-srv integration test that clones literals
fasterthanlime Jul 20, 2022
9a8efe2
Update crates/proc-macro-test/build.rs
fasterthanlime Jul 20, 2022
844aa8b
Update crates/proc-macro-test/build.rs
fasterthanlime Jul 20, 2022
7dc36ee
Auto merge of #12831 - fasterthanlime:proc-macro-test-in-tmp-dir, r=f…
bors Jul 20, 2022
cd2c240
Auto merge of #12833 - fasterthanlime:literal-tests, r=Veykril
bors Jul 20, 2022
dcd52ec
Add PROC_MACRO_TEST_TOOLCHAIN environment variable
fasterthanlime Jul 20, 2022
fa883cb
Auto merge of #12834 - fasterthanlime:proc-macro-test-toolchain, r=Ve…
bors Jul 20, 2022
315b0a7
Add sysroot-abi feature, copy 1.64 ABI fo rnow
fasterthanlime Jul 20, 2022
e009cdc
Move token_stream to separate module
fasterthanlime Jul 20, 2022
00bc060
Fix imports, delete removed interfaces
fasterthanlime Jul 20, 2022
191db9f
stub missing APIs
fasterthanlime Jul 20, 2022
d25b610
Add literal/ident conversion, tests pass
fasterthanlime Jul 20, 2022
480f555
implement literal_from_str (poorly)
fasterthanlime Jul 20, 2022
c83f14a
Remove AstIdMap from Expander as it is seldom needed
Veykril Jul 21, 2022
7bd2e30
Simplify
Veykril Jul 21, 2022
2f6c390
Auto merge of #12827 - Veykril:be-lazy, r=Veykril
bors Jul 21, 2022
10c7ee7
Simplify
Veykril Jul 21, 2022
1aadd9d
internal: Use itemtree for variant and field attribute collection
Veykril Jul 21, 2022
5f9a582
Use ItemTree for crate root attr_query collection
Veykril Jul 21, 2022
cfad882
fix: Fix `trait_impls_in_deps_query` being called directly instead of…
Veykril Jul 21, 2022
84a6fac
Auto merge of #12841 - Veykril:query-fix, r=Veykril
bors Jul 21, 2022
fdddd83
Assert that sysroot ABI version matches exactly
fasterthanlime Jul 21, 2022
bbaf4da
Pass tidy checks
fasterthanlime Jul 21, 2022
3076959
Move version string to RustcInfo, read '.rustc' section only once
fasterthanlime Jul 21, 2022
05d8f5f
Use a thread-local for the symbol interner (1/2)
fasterthanlime Jul 21, 2022
32ee097
Run proc macro expansion in a separate thread (for the thread-local i…
fasterthanlime Jul 21, 2022
36d825f
Add test for literals created client-side
fasterthanlime Jul 21, 2022
9cf99a9
Stringify literals create client-side properly
fasterthanlime Jul 21, 2022
941416a
Add test for idents incl. raw idents
fasterthanlime Jul 21, 2022
246947b
Fix raw ident handling (a little)
fasterthanlime Jul 21, 2022
48bcc22
Move interner methods to Symbol, return SmolStr directly since it's r…
fasterthanlime Jul 21, 2022
39db9cd
Use std::panic::resume_unwind
fasterthanlime Jul 21, 2022
e591ff3
Add comment about replacing crossbeam with std scoped threads when th…
fasterthanlime Jul 22, 2022
cb8a3be
Auto merge of #12835 - fasterthanlime:sysroot-abi, r=fasterthanlime
bors Jul 22, 2022
1ab862a
fix: Improve syntax highlighting in attributes
Veykril Jul 22, 2022
7e30ca1
Auto merge of #12844 - Veykril:highlight-attr, r=Veykril
bors Jul 22, 2022
0081ef3
Use ItemTree for modules in attrs_query
Veykril Jul 21, 2022
d469e0d
Auto merge of #12840 - Veykril:be-lazy, r=Veykril
bors Jul 22, 2022
f1b5e38
Revert 03a62c180e6a7300d0d7b8c4d680b749c101bcbb
Veykril Jul 22, 2022
8272d2a
Auto merge of #12847 - Veykril:vscode-downgrade, r=Veykril
bors Jul 22, 2022
cb6703f
internal: Don't parse files unnecessarily in scope_for_offset
Veykril Jul 22, 2022
e223d20
fix: Fix error tooltip message for VSCode status bar item
Veykril Jul 22, 2022
fbb1337
Auto merge of #12850 - Veykril:display-fix, r=Veykril
bors Jul 22, 2022
0b131bc
Auto merge of #12849 - Veykril:no-parse, r=Veykril
bors Jul 22, 2022
ff041bf
fix generate_new doc
RalfJung Jul 23, 2022
f3a46f6
Auto merge of #12854 - RalfJung:generate_new, r=Veykril
bors Jul 23, 2022
13c83f9
fix: Don't add braces to 'if' completion in match guard position
DorianListens Jul 23, 2022
2be0062
Auto merge of #12851 - DorianListens:dscheidt/if-completion-match-gua…
bors Jul 23, 2022
a436be4
feat: don't highlight the whole fn on return-type mismatch
matklad Jul 23, 2022
5bd8443
internal: extract common code for adjusting diagnostic range
matklad Jul 23, 2022
977e12a
Auto merge of #12859 - matklad:dont-color-the-whole-block-red-all-the…
bors Jul 23, 2022
3c98486
Remove rust-analyzer submodule
fasterthanlime Jul 24, 2022
43acb50
Add 'src/tools/rust-analyzer/' from commit '977e12a0bdc3e329af179ef3a…
fasterthanlime Jul 24, 2022
0f2266d
Convert rust-analyzer to 'in-tree' tool, pass 'in-rust-tree' feature …
fasterthanlime Jul 22, 2022
9cf485c
Add check step, stuck on 'no output generated for libgoto_def-hash rm…
fasterthanlime Jul 22, 2022
d59abcf
Check only tests and benches, not examples
fasterthanlime Jul 22, 2022
4ea2f8e
Add test step for rust-analyzer, run it by default
fasterthanlime Jul 22, 2022
4dedb58
Use compiler.stage
fasterthanlime Jul 22, 2022
d42b28a
Allow cross-compiling, build all crates
fasterthanlime Jul 22, 2022
37ed531
Use top-level path in tool Step
fasterthanlime Jul 22, 2022
44f50c5
Add comment about CARGO_WORKSPACE_DIR
fasterthanlime Jul 22, 2022
107e265
Don't run slow tests in Rust CI, only RA CI
fasterthanlime Jul 22, 2022
7534562
Disable all source-gen tests at compile time
fasterthanlime Jul 23, 2022
e0add21
Move cfg attrs up to the mod definitions to disable sourcegen
fasterthanlime Jul 23, 2022
ee09dc5
Small fixups
jyn514 Jul 23, 2022
1bb63df
Fix .gitattributes for test_data
fasterthanlime Jul 24, 2022
e436260
hir-def tests: sort results before comparing, since FxHashSet iterati…
fasterthanlime Jul 24, 2022
4e1a302
Sort in DefMap::dump, since HashMap iteration order isn't defined
fasterthanlime Jul 24, 2022
6c07c71
Sort when iterating through CrateGraph
fasterthanlime Jul 24, 2022
ee584c1
Make macros test order-resistant
fasterthanlime Jul 24, 2022
fa0037a
Only run proc-macro-srv tests for now (after discussion with @Veykril…
fasterthanlime Jul 24, 2022
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
Prev Previous commit
Next Next commit
Small fixups
- use `path` instead of `paths`
- don't mark rust-analyzer as an optional tool
- print the cargo command that's run in the proc-macro-test build script

  this originally was part of a change to fix `test --stage 0 rust-analyzer`,
  but I'm going to leave that for a separate PR so it's easier to review.
  • Loading branch information
jyn514 authored and fasterthanlime committed Jul 24, 2022
commit ee09dc5510a775963183d4bde9c36dce2a6863ce
2 changes: 1 addition & 1 deletion src/bootstrap/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ impl Step for RustAnalyzer {
const DEFAULT: bool = true;

fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
run.paths(&["src/tools/rust-analyzer"])
run.path("src/tools/rust-analyzer")
}

fn make_run(run: RunConfig<'_>) {
Expand Down
2 changes: 1 addition & 1 deletion src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ impl Step for RustAnalyzer {
mode: Mode::ToolStd,
path: "src/tools/rust-analyzer",
extra_features: vec!["rust-analyzer/in-rust-tree".to_owned()],
is_optional_tool: true,
is_optional_tool: false,
source_type: SourceType::InTree,
})
}
Expand Down
10 changes: 6 additions & 4 deletions src/tools/rust-analyzer/crates/proc-macro-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,19 @@ fn main() {
Command::new(toolchain::cargo())
};

let output = cmd
cmd
.current_dir(&staging_dir)
.args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
// Explicit override the target directory to avoid using the same one which the parent
// cargo is using, or we'll deadlock.
// This can happen when `CARGO_TARGET_DIR` is set or global config forces all cargo
// instance to use the same target directory.
.arg("--target-dir")
.arg(&target_dir)
.output()
.unwrap();
.arg(&target_dir);

println!("Running {:?}", cmd);

let output = cmd.output().unwrap();
if !output.status.success() {
println!("proc-macro-test-impl failed to build");
println!("============ stdout ============");
Expand Down