Commit graph

2 commits

Author SHA1 Message Date
codehorseman
4beda1be70 resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
2022-03-16 20:12:30 +08:00
flip1995
fb0142ae41 Merge commit '97a5daa659' into clippyup 2022-01-13 13:18:19 +01:00