]> git.lizzy.rs Git - rust.git/commitdiff
Merge #8154 #8155
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Mon, 22 Mar 2021 17:56:18 +0000 (17:56 +0000)
committerGitHub <noreply@github.com>
Mon, 22 Mar 2021 17:56:18 +0000 (17:56 +0000)
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 <aleksey.kladov@gmail.com>
Co-authored-by: Jonas Schievink <jonas.schievink@ferrous-systems.com>

Trivial merge