aboutsummaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2021-03-22 17:56:18 +0000
committerGitHub <[email protected]>2021-03-22 17:56:18 +0000
commit97fe64a5c7d68a40adf7b88d5cc992f9f3066537 (patch)
tree6f678b5d5f1841caecb1dc2c93f1fd2cbb5567ea /assets
parentd834306e7cf85fe0b07e4979d2ff39bf4ef1f6be (diff)
parent9cbf09ec4f24aa30af1d9855a909a6cfc67188f7 (diff)
parent2633e23f2bf0649031b887309cda1fecae063084 (diff)
Merge #8154 #8155
8154: rewrite merge use trees assist to use muatable syntax trees r=matklad a=matklad bors r+ 🤖 8155: Fix confusion between parameters and the function r=jonas-schievink a=jonas-schievink Fixes https://github.com/rust-analyzer/rust-analyzer/issues/8152 bors r+ Co-authored-by: Aleksey Kladov <[email protected]> Co-authored-by: Jonas Schievink <[email protected]>