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

Avoid parking_lot bustage with recent rustc nightlies. #26646

Merged
merged 1 commit into from May 26, 2020

Conversation

@jdm
Copy link
Member

jdm commented May 25, 2020

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #26644
  • There are tests for these changes
@highfive
Copy link

highfive commented May 25, 2020

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/Cargo.toml
  • @KiChjang: components/script/Cargo.toml
  • @emilio: components/style/Cargo.toml, components/layout/Cargo.toml
@highfive
Copy link

highfive commented May 25, 2020

warning Warning warning

  • These commits modify style, layout, and script code, but no tests are modified. Please consider adding a test!
@asajeffrey
Copy link
Member

asajeffrey commented May 26, 2020

@bors-servo
Copy link
Contributor

bors-servo commented May 26, 2020

📌 Commit bd6c9d9 has been approved by asajeffrey

@CYBAI
Copy link
Collaborator

CYBAI commented May 26, 2020

We're able to remove metal from the duplicated list 🎉

./Cargo.lock:1: duplicates for `metal` are allowed, but only single version found
	The following packages depend on version 0.18.0 from 'crates.io':

Also, looks like this nightly doesn't have rustfmt 👀 (I checked rustup-component-history; rustfmt is missing for few days...)

error: �(Bcomponent 'rustfmt' for target 'x86_64-unknown-linux-gnu' is unavailable for download for channel nightly-2020-05-20
Sometimes not all components are available in any given nightly.
error: �(Bbacktrace:
error: �(Bstack backtrace:
   0: error_chain::backtrace::imp::InternalBacktrace::new
   1: rustup::dist::manifestation::Manifestation::update
   2: rustup::toolchain::Toolchain::add_component
   3: rustup_init::rustup_mode::main
   4: rustup_init::run_rustup_inner
   5: rustup_init::main
   6: std::rt::lang_start::{{closure}}
   7: main
   8: __libc_start_main
   9: <unknown>
error: �(B'cargo-fmt' is not installed for the toolchain 'nightly-2020-05-20-x86_64-unknown-linux-gnu'
To install, run `rustup component add rustfmt`
error: �(Bbacktrace:
error: �(Bstack backtrace:
   0: error_chain::backtrace::imp::InternalBacktrace::new
   1: rustup::toolchain::Toolchain::create_command
   2: rustup_init::run_rustup_inner
   3: rustup_init::main
   4: std::rt::lang_start::{{closure}}
   5: main
   6: __libc_start_main
   7: <unknown>
clang-format not installed. Skipping CPP formatting.
Run `./mach fmt` to fix the formatting
@jdm
Copy link
Member Author

jdm commented May 26, 2020

@SimonSapin SimonSapin mentioned this pull request May 26, 2020
7 of 7 tasks complete
@jdm jdm force-pushed the jdm:parking_lot branch from bd6c9d9 to 1da40b5 May 26, 2020
@jdm
Copy link
Member Author

jdm commented May 26, 2020

@bors-servo r=asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented May 26, 2020

📌 Commit 1da40b5 has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented May 26, 2020

Testing commit 1da40b5 with merge f331373...

@bors-servo
Copy link
Contributor

bors-servo commented May 26, 2020

☀️ Test successful - status-taskcluster
Approved by: asajeffrey
Pushing f331373 to master...

@bors-servo bors-servo merged commit f331373 into servo:master May 26, 2020
2 checks passed
2 checks passed
Community-TC (pull_request) TaskGroup: success
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

6 participants
You can’t perform that action at this time.