Skip to content

Conversation

jsgf
Copy link
Contributor

@jsgf jsgf commented Nov 25, 2019

Use the user-specified path as-is, so it remains relative if specified as relative.
Should also address Windows path canonicalization issues.

Resolves issue #7316

@rust-highfive
Copy link

r? @Eh2406

(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 Nov 25, 2019
@jsgf jsgf changed the title vendor: don't use canonical path in .config vendor: don't use canonical path in .cargo/config Nov 25, 2019
Use the user-specified path as-is, so it remains relative if specified as relative.
Should also address Windows path canonicalization issues.

Resolves issue rust-lang#7316
@jsgf
Copy link
Contributor Author

jsgf commented Nov 25, 2019

One open question is whether to replicate the behaviour of cargo-vendor and use a --relative-path option to choose this behaviour. I don't really see much value in it since the command is currently so inconsistent about whether the path is relative or absolute.

@jsgf
Copy link
Contributor Author

jsgf commented Nov 25, 2019

Test failures seem spurious.

@Eh2406
Copy link
Contributor

Eh2406 commented Nov 25, 2019

vendor... so
@bors r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned Eh2406 Nov 25, 2019
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 25, 2019

📌 Commit 4c67a2d 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 Nov 25, 2019
@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit 4c67a2d with merge 188b718a2fca68bb75b287feae3e6a38547d7d39...

@alexcrichton
Copy link
Member

@bors: retry

gonna get the nightly fix in first

@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit 4c67a2d with merge 5066168fa2dc785786089e840df99b27b1563c1b...

@alexcrichton
Copy link
Member

@bors: retry

got the queue priority wrong

@bors
Copy link
Contributor

bors commented Nov 25, 2019

⌛ Testing commit 4c67a2d with merge a41c8ea...

bors added a commit that referenced this pull request Nov 25, 2019
vendor: don't use canonical path in .cargo/config

Use the user-specified path as-is, so it remains relative if specified as relative.
Should also address Windows path canonicalization issues.

Resolves issue #7316
@bors
Copy link
Contributor

bors commented Nov 25, 2019

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing a41c8ea to master...

@bors bors merged commit 4c67a2d into rust-lang:master Nov 25, 2019
bors added a commit to rust-lang/rust that referenced this pull request Dec 4, 2019
Update cargo

11 commits in 750cb1482e4d0e74822cded7ab8b3c677ed8b041..626f0f40efd32e6b3dbade50cd53fdfaa08446ba
2019-11-23 23:06:36 +0000 to 2019-12-03 16:53:04 +0000
- Change some texts to links in README (rust-lang/cargo#7652)
- Update config and environment variable docs. (rust-lang/cargo#7650)
- Stop ignoring .rs.bk files; rustfmt hasn't generated them in years (rust-lang/cargo#7647)
- Various contributing docs updates. (rust-lang/cargo#7642)
- Stabilize profile-overrides. (rust-lang/cargo#7591)
- Update comment about ResolveVersion default version. (rust-lang/cargo#7637)
- Update tests for slight wording change in rustdoc error message. (rust-lang/cargo#7641)
- Remove dep_targets. (rust-lang/cargo#7626)
- vendor: don't use canonical path in .cargo/config (rust-lang/cargo#7629)
- Minor testsuite organization. (rust-lang/cargo#7628)
- Remove failing plugin tests. (rust-lang/cargo#7630)
@ehuss ehuss added this to the 1.41.0 milestone Feb 6, 2022
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.

6 participants