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

Update cargo #73415

Merged
merged 1 commit into from
Jun 22, 2020
Merged

Update cargo #73415

merged 1 commit into from
Jun 22, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 16, 2020

3 commits in 79c769c3d7b4c2cf6a93781575b7f592ef974255..089cbb80b73ba242efdcf5430e89f63fa3b5328d
2020-06-11 22:13:37 +0000 to 2020-06-15 14:38:34 +0000

@ehuss ehuss self-assigned this Jun 16, 2020
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

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

ehuss commented Jun 16, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jun 16, 2020

📌 Commit 8f5ff7b has been approved by ehuss

@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 Jun 16, 2020
@Mark-Simulacrum
Copy link
Member

@ehuss Does this re-enable doc tests for std? If so we might want to rollup=never and prioritize it.

@ehuss
Copy link
Contributor Author

ehuss commented Jun 18, 2020

No, this re-enables doc-tests on nightly (affects the rest of the ecosystem that uses nightly).

Doc-tests for std will be re-enabled by #73411.

Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 20, 2020
Update cargo

3 commits in 79c769c3d7b4c2cf6a93781575b7f592ef974255..089cbb80b73ba242efdcf5430e89f63fa3b5328d
2020-06-11 22:13:37 +0000 to 2020-06-15 14:38:34 +0000
- Support linker with -Zdoctest-xcompile. (rust-lang/cargo#8359)
- Fix doctests not running with --target=HOST. (rust-lang/cargo#8358)
- Allow passing a registry index url directly to `cargo install` (rust-lang/cargo#8344)
@Dylan-DPC-zz
Copy link

let this merge individually

@bors p=1 rollup=never

@Manishearth
Copy link
Member

@bors r-

This is going to fail, there are some doctests that were never passing that need to be fixed

From #73536 (comment)

---
---- result.rs - result::Result<T, E>::as_deref (line 1157) stdout ----
error[E0658]: use of unstable library feature 'inner_deref'
 --> result.rs:1160:14
  |
6 | assert_eq!(x.as_deref(), y);
  |
  |
  = note: see issue #50264 <***/issues/50264> for more information
  = help: add `#![feature(inner_deref)]` to the crate attributes to enable
error[E0658]: use of unstable library feature 'inner_deref'
  --> result.rs:1164:14
   |
   |
10 | assert_eq!(x.as_deref(), y);
   |
   |
   = note: see issue #50264 <***/issues/50264> for more information
   = help: add `#![feature(inner_deref)]` to the crate attributes to enable
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0658`.
Couldn't compile the test.
Couldn't compile the test.
---- result.rs - result::Result<T, E>::as_deref_mut (line 1191) stdout ----
error[E0308]: mismatched types
 --> result.rs:1193:40
  |
5 | let y: Result<&mut str, &mut u32> = Ok("HELLO");
  |                                        ^^^^^^^ types differ in mutability
  = note: expected mutable reference `&mut str`
                     found reference `&'static str`

error[E0658]: use of unstable library feature 'inner_deref'
error[E0658]: use of unstable library feature 'inner_deref'
 --> result.rs:1194:14
  |
6 | assert_eq!(x.as_deref_mut().map(|x| { x.make_ascii_uppercase(); x }), y);
  |
  |
  = note: see issue #50264 <***/issues/50264> for more information
  = help: add `#![feature(inner_deref)]` to the crate attributes to enable
error[E0308]: mismatched types
 --> result.rs:1197:41
  |
  |
9 | let y: Result<&mut str, &mut u32> = Err(&42);
  |                                         ^^^ types differ in mutability
  = note: expected mutable reference `&mut u32`
                     found reference `&u32`

error[E0658]: use of unstable library feature 'inner_deref'
error[E0658]: use of unstable library feature 'inner_deref'
  --> result.rs:1198:14
   |
10 | assert_eq!(x.as_deref_mut().map(|x| { x.make_ascii_uppercase(); x }), y);
   |
   |
   = note: see issue #50264 <***/issues/50264> for more information
   = help: add `#![feature(inner_deref)]` to the crate attributes to enable
error: aborting due to 4 previous errors

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 20, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jun 20, 2020

@Manishearth I think you may have this PR mistaken for #73411. The in-tree Cargo is not used for anything (besides cargotest, which just started a few days ago).

@bors r+

@bors
Copy link
Contributor

bors commented Jun 20, 2020

📌 Commit 8f5ff7b has been approved by ehuss

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 20, 2020
@Manishearth
Copy link
Member

@ehuss ah, i see

@bors
Copy link
Contributor

bors commented Jun 22, 2020

⌛ Testing commit 8f5ff7b with merge a2ecd9f23fadd15359be41d3b851658cb0c5e553...

@bors
Copy link
Contributor

bors commented Jun 22, 2020

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 22, 2020
@ehuss
Copy link
Contributor Author

ehuss commented Jun 22, 2020

@bors retry
The macOS x86_64 job inexplicably was running 2-3 times slower than normal (based on timing data). No obvious hardware differences. 🤷

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 22, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 22, 2020
@bors
Copy link
Contributor

bors commented Jun 22, 2020

⌛ Testing commit 8f5ff7b with merge 6bb3dbf...

@bors
Copy link
Contributor

bors commented Jun 22, 2020

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 6bb3dbf to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 22, 2020
@bors bors merged commit 6bb3dbf into rust-lang:master Jun 22, 2020
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

7 participants