Hi Philip, On Mon, Jul 12, 2021 at 09:09:09AM +0100, Philip Herron wrote: > This patch looks good to me. When I tried to apply it to merge it I got > the following: > > ``` > $ git am '[PATCH] Handle doc comment strings in lexer and parser.eml' > Applying: Handle doc comment strings in lexer and parser > error: corrupt patch at line 531 > Patch failed at 0001 Handle doc comment strings in lexer and parser > hint: Use 'git am --show-current-patch' to see the failed patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > ``` > > Not sure if I have done something wrong, have you any pointers?
Looks like that is one of the IsolatedCR tests (a bare \r not at the end of a line followed by \n in a doc comment string). I assume some mailer ate it and/or added a \n somehwere to "correct" it. Would you be able to pull directly from my git repo? The following changes since commit 4560f469ee33536cec6af0f8e5816ff97de60de0: Merge #551 (2021-07-10 21:02:06 +0000) are available in the Git repository at: https://code.wildebeest.org/git/user/mjw/gccrs doc-comments for you to fetch changes up to e1e14958a90397a1ed6ab7236dc5a6f1c2f22505: Handle doc comment strings in lexer and parser (2021-07-11 21:09:21 +0200) ---------------------------------------------------------------- Mark Wielaard (1): Handle doc comment strings in lexer and parser gcc/rust/ast/rust-ast.h | 2 + gcc/rust/lex/rust-lex.cc | 214 +++++++++++++++++++-- gcc/rust/lex/rust-token.h | 25 ++- gcc/rust/parse/rust-parse-impl.h | 60 +++++- gcc/rust/parse/rust-parse.h | 1 + gcc/testsuite/rust/compile/bad_inner_doc.rs | 15 ++ .../rust/compile/doc_isolated_cr_block_comment.rs | 3 + .../compile/doc_isolated_cr_inner_block_comment.rs | 5 + .../compile/doc_isolated_cr_inner_line_comment.rs | 5 + .../rust/compile/doc_isolated_cr_line_comment.rs | 3 + .../compile/torture/all_doc_comment_line_blocks.rs | 47 +++++ .../torture/all_doc_comment_line_blocks_crlf.rs | 47 +++++ .../compile/torture/isolated_cr_block_comment.rs | 2 + .../compile/torture/isolated_cr_line_comment.rs | 2 + 14 files changed, 401 insertions(+), 30 deletions(-) create mode 100644 gcc/testsuite/rust/compile/bad_inner_doc.rs create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_block_comment.rs create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_inner_block_comment.rs create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_inner_line_comment.rs create mode 100644 gcc/testsuite/rust/compile/doc_isolated_cr_line_comment.rs create mode 100644 gcc/testsuite/rust/compile/torture/all_doc_comment_line_blocks.rs create mode 100644 gcc/testsuite/rust/compile/torture/all_doc_comment_line_blocks_crlf.rs create mode 100644 gcc/testsuite/rust/compile/torture/isolated_cr_block_comment.rs create mode 100644 gcc/testsuite/rust/compile/torture/isolated_cr_line_comment.rs -- Gcc-rust mailing list Gcc-rust@gcc.gnu.org https://gcc.gnu.org/mailman/listinfo/gcc-rust
