Skip to content

Conversation

alexcrichton
Copy link
Member

Hopefully brining in a few fixes to Cargo regressions!

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

warning Warning 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 May 5, 2018
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented May 7, 2018

📌 Commit aa8b924 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 7, 2018
@bors
Copy link
Collaborator

bors commented May 8, 2018

⌛ Testing commit aa8b92455bbd2531288a1ab250f1be3c508a30bb with merge 5a21c8dcd47d6a2d8753a5293e447bb336aee387...

@bors
Copy link
Collaborator

bors commented May 8, 2018

💔 Test failed - status-appveyor

@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 May 8, 2018
@kennytm
Copy link
Member

kennytm commented May 8, 2018

The new cargo has broken RLS (we are not allowed to regress tools until Thursday)

[RUSTC-TIMING] cargo test:false 205.713
error[E0432]: unresolved import `cargo::ops::CompileMode`
  --> tools\rls\src\build\cargo.rs:13:52
   |
13 | use cargo::ops::{compile_with_exec, CompileFilter, CompileMode, CompileOptions, Packages};
   |                                                    ^^^^^^^^^^^ no `CompileMode` in `ops`
error[E0560]: struct `cargo::ops::CompileOptions<'_>` has no field named `target`
   --> tools\rls\src\build\cargo.rs:192:9
    |
192 |         target: opts.target,
    |         ^^^^^^ `cargo::ops::CompileOptions<'_>` does not have this field
    |
    = note: available fields are: `config`, `build_config`, `features`, `all_features`, `no_default_features` ... and 5 others
error[E0560]: struct `cargo::ops::CompileOptions<'_>` has no field named `jobs`
   --> tools\rls\src\build\cargo.rs:210:9
    |
210 |         jobs: opts.jobs,
    |         ^^^^ `cargo::ops::CompileOptions<'_>` does not have this field
    |
    = note: available fields are: `config`, `build_config`, `features`, `all_features`, `no_default_features` ... and 5 others
error[E0599]: no function or associated item named `default` found for type `cargo::ops::CompileOptions<'_>` in the current scope
   --> tools\rls\src\build\cargo.rs:211:11
    |
211 |         ..CompileOptions::default(&config, CompileMode::Check { test: cfg_test })
    |           ^^^^^^^^^^^^^^^^^^^^^^^ function or associated item not found in `cargo::ops::CompileOptions<'_>`
error: aborting due to 4 previous errors

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels May 8, 2018
@alexcrichton
Copy link
Member Author

I've sent an update to the RLS to rust-lang/rls#854

@Xanewok
Copy link
Contributor

Xanewok commented May 8, 2018

PR on the RLS side was merged now, so this should be good to go.

@alexcrichton
Copy link
Member Author

Awesome, thanks @Xanewok!

@bors: r+

@bors
Copy link
Collaborator

bors commented May 8, 2018

📌 Commit 9399836 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 8, 2018
Hopefully brining in a few fixes to Cargo regressions as well as some new
stdsimd functions!
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented May 8, 2018

📌 Commit 576aab9 has been approved by alexcrichton

kennytm added a commit to kennytm/rust that referenced this pull request May 9, 2018
…ichton

Update the Cargo submodule

Hopefully brining in a few fixes to Cargo regressions!
bors added a commit that referenced this pull request May 9, 2018
Rollup of 11 pull requests

Successful merges:

 - #49988 (Mention Result<!, E> in never docs.)
 - #50148 (turn `ManuallyDrop::new` into a constant function)
 - #50456 (Update the Cargo submodule)
 - #50460 (Make `String::new()` const)
 - #50464 (Remove some transmutes)
 - #50505 (Added regression function match value test)
 - #50511 (Add some explanations for #[must_use])
 - #50525 (Optimize string handling in lit_token().)
 - #50527 (Cleanup a `use` in a raw_vec test)
 - #50539 (Add more logarithm constants)
 - #49523 (Update RELEASES.md for 1.26.0)

Failed merges:
@bors bors merged commit 576aab9 into rust-lang:master May 9, 2018
@alexcrichton alexcrichton deleted the update-cargo branch May 10, 2018 19:19
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