Skip to content

Commit

Permalink
Unrolled build for rust-lang#128755
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#128755 - yaahc:jj-crlf, r=estebank

Integrate crlf directly into related test file instead via of .gitattributes

resolves rust-lang#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
  • Loading branch information
rust-timer authored Aug 7, 2024
2 parents ce20e15 + b174cf8 commit 2ba77da
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/intra-doc/.gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
warning-crlf.rs eol=crlf
warning-crlf.rs -text
52 changes: 26 additions & 26 deletions tests/rustdoc-ui/intra-doc/warning-crlf.rs
Original file line number Diff line number Diff line change
@@ -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`

0 comments on commit 2ba77da

Please sign in to comment.