Skip to main content

I love it when I get #Rust errors that I worked on and forgot about
Rust compiler error output: error: encountered diff marker --> /home/gh-estebank/rust/compiler/rustc_interface/src/util.rs:108:1 | 108 | <<<<<<< HEAD | ^^^^^^^ after this is the code before the merge 109 | rustc_version_str().unwrap_or("unknown"), 110 | ======= | ------- 111 | ice_file, 112 | >>>>>>> 6d32cbf73d3 (On nightly, dump ICE backtraces to disk) | ^^^^^^^ above this are the incoming code changes | = help: if you're having merge conflicts after pulling new code, the top section is the code you already had and the bottom section is the remote code = help: if you're in the middle of a rebase, the top section is the code being rebased onto and the bottom section is the code coming from the current commit being rebased = note: for an explanation on these markers from the `git` documentation, visit <https://git-scm.com/book/en/v2/Git-Tools-Advanced-Merging#_checking_out_conflicts>
#rust
in reply to Esteban K�ber

Federico Mena Quintero
Federico Mena Quintero
• •
"cargo test will run both versions and keep the one which works" 😉
in reply to Hubert Figuière

Esteban K�ber
Esteban K�ber
• •
@hub @federicomena for error recovery we have a benefit that the language itself doesn't: we can ignore the hard cases. If only one works, great! Use that as a signal for which parse to keep around for later analysis. If neither or both do, you fall back to the simpler error and bail early to avoid unnecessary knock down errors.
@Federico Mena Quintero @Hubert Figuière
⇧