Rollup merge of #128755 - yaahc:jj-crlf, r=estebank
Integrate crlf directly into related test file instead via of .gitattributes resolves https://github.com/rust-lang/rust/issues/128708 This PR seeks to resolve a contributor papercut when using jj to manage the git repo locally which does not support .gitattributes. It does so by integrating the crlf characters directly into the related test and disabling Git's end of line normalization logic across platforms for that specific file, instead of configuring git to always check out the files with alternative eol characters. related documentation: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1
This commit is contained in:
commit
e5a3c32ffa
2 changed files with 27 additions and 27 deletions
2
tests/rustdoc-ui/intra-doc/.gitattributes
vendored
2
tests/rustdoc-ui/intra-doc/.gitattributes
vendored
|
@ -1 +1 @@
|
|||
warning-crlf.rs eol=crlf
|
||||
warning-crlf.rs -text
|
||||
|
|
|
@ -1,26 +1,26 @@
|
|||
// ignore-tidy-cr
|
||||
//@ check-pass
|
||||
|
||||
// This file checks the spans of intra-link warnings in a file with CRLF line endings. The
|
||||
// .gitattributes file in this directory should enforce it.
|
||||
|
||||
/// [error]
|
||||
pub struct A;
|
||||
//~^^ WARNING `error`
|
||||
|
||||
///
|
||||
/// docs [error1]
|
||||
//~^ WARNING `error1`
|
||||
|
||||
/// docs [error2]
|
||||
///
|
||||
pub struct B;
|
||||
//~^^^ WARNING `error2`
|
||||
|
||||
/**
|
||||
* This is a multi-line comment.
|
||||
*
|
||||
* It also has an [error].
|
||||
*/
|
||||
pub struct C;
|
||||
//~^^^ WARNING `error`
|
||||
// ignore-tidy-cr
|
||||
//@ check-pass
|
||||
|
||||
// This file checks the spans of intra-link warnings in a file with CRLF line endings. The
|
||||
// .gitattributes file in this directory should enforce it.
|
||||
|
||||
/// [error]
|
||||
pub struct A;
|
||||
//~^^ WARNING `error`
|
||||
|
||||
///
|
||||
/// docs [error1]
|
||||
//~^ WARNING `error1`
|
||||
|
||||
/// docs [error2]
|
||||
///
|
||||
pub struct B;
|
||||
//~^^^ WARNING `error2`
|
||||
|
||||
/**
|
||||
* This is a multi-line comment.
|
||||
*
|
||||
* It also has an [error].
|
||||
*/
|
||||
pub struct C;
|
||||
//~^^^ WARNING `error`
|
||||
|
|
Loading…
Add table
Reference in a new issue