]> git.lizzy.rs Git - rust.git/commit
Resolve E0584 conflict
authorNathan Corbyn <me@nathancorbyn.com>
Mon, 8 Jun 2020 10:57:56 +0000 (11:57 +0100)
committerNathan Corbyn <me@nathancorbyn.com>
Mon, 8 Jun 2020 11:00:12 +0000 (12:00 +0100)
commita1eeaddf3f7aad9e82196d338613593e4e000762
tree5b9c9faa37cbde9d37b6e7fd1195717d0bbf41b6
parent73558160933b2764ed9a84b1b2b647e128eac3f8
Resolve E0584 conflict
src/librustc_error_codes/error_codes.rs
src/librustc_error_codes/error_codes/E0761.md [new file with mode: 0644]
src/librustc_expand/module.rs
src/test/ui/mod/mod_file_disambig.stderr