mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-15 12:39:31 +03:00
be4794c78b
Rollup of 5 pull requests Successful merges: - rust-lang/rust#150443 (Support long diff conflict markers) - rust-lang/rust#151887 (Remove some unnecessary `try`-related type annotations) - rust-lang/rust#152037 (Suppress unused_mut lint if mutation fails due to borrowck error) - rust-lang/rust#152067 (Weaken `assert_dep_node_not_yet_allocated_in_current_session` for multiple threads) - rust-lang/rust#151227 (Document `-Zcache-proc-macros`)