Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix update-references for tests within subdirectories. #50447

Merged
merged 1 commit into from
May 11, 2018

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented May 4, 2018

Fixes #50438.

I'll make this more robust later for #49815.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 4, 2018
@ehuss
Copy link
Contributor Author

ehuss commented May 4, 2018

cc @nikomatsakis

@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented May 4, 2018

📌 Commit ab3b816 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2018
kennytm added a commit to kennytm/rust that referenced this pull request May 4, 2018
…crichton

Fix update-references for tests within subdirectories.

Fixes rust-lang#50438.

I'll make this more robust later for rust-lang#49815.
@ehuss ehuss force-pushed the fix-update-references branch from ab3b816 to 5128aff Compare May 9, 2018 03:27
@ehuss
Copy link
Contributor Author

ehuss commented May 10, 2018

@alexcrichton I had to rebase and tweak this patch to deal with another PR that got merged while it was waiting. Does it need to be reapproved?

(Note: This will conflict with #50400 which has a similar, but slightly different change.)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented May 10, 2018

📌 Commit 5128aff has been approved by alexcrichton

alexcrichton added a commit to alexcrichton/rust that referenced this pull request May 10, 2018
…crichton

Fix update-references for tests within subdirectories.

Fixes rust-lang#50438.

I'll make this more robust later for rust-lang#49815.
alexcrichton added a commit to alexcrichton/rust that referenced this pull request May 10, 2018
…crichton

Fix update-references for tests within subdirectories.

Fixes rust-lang#50438.

I'll make this more robust later for rust-lang#49815.
bors added a commit that referenced this pull request May 10, 2018
Rollup of 18 pull requests

Successful merges:

 - #49423 (Extend tests for RFC1598 (GAT))
 - #50010 (Give SliceIndex impls a test suite of girth befitting the implementation (and fix a UTF8 boundary check))
 - #50447 (Fix update-references for tests within subdirectories.)
 - #50514 (Pull in a wasm fix from LLVM upstream)
 - #50524 (Make DepGraph::previous_work_products immutable)
 - #50532 (Don't use Lock for heavily accessed CrateMetadata::cnum_map.)
 - #50538 ( Make CrateNum allocation more thread-safe. )
 - #50564 (Inline `Span` methods.)
 - #50565 (Use SmallVec for DepNodeIndex within dep_graph.)
 - #50569 (Allow for specifying a linker plugin for cross-language LTO)
 - #50572 (Clarify in the docs that `mul_add` is not always faster.)
 - #50574 (add fn `into_inner(self) -> (Idx, Idx)` to RangeInclusive (#49022))
 - #50575 (std: Avoid `ptr::copy` if unnecessary in `vec::Drain`)
 - #50588 (Move "See also" disambiguation links for primitive types to top)
 - #50590 (Fix tuple struct field spans)
 - #50591 (Restore RawVec::reserve* documentation)
 - #50598 (Remove unnecessary mutable borrow and resizing in DepGraph::serialize)
 - #50606 (Retry when downloading the Docker cache.)

Failed merges:

 - #50161 (added missing implementation hint)
 - #50558 (Remove all reference to DepGraph::work_products)
@bors bors merged commit 5128aff into rust-lang:master May 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants