Migrate :target rules to use CSS variables#104169
Merged
bors merged 2 commits intorust-lang:masterfrom Nov 11, 2022
Merged
Conversation
Collaborator
|
A change occurred in the Ayu theme. cc @Cldfire Some changes occurred in HTML/CSS/JS. cc @GuillaumeGomez, @Folyd, @jsha |
Contributor
|
@bors r+ rollup |
Collaborator
|
📌 Commit d2485d40c212e959cac8824b5d281c2a7e2cf9e4 has been approved by It is now in the queue for this repository. |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 10, 2022
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#102763 (Some diagnostic-related nits) - rust-lang#103443 (Parser: Recover from using colon as path separator in imports) - rust-lang#103675 (remove redundent "<>" for ty::Slice with reference type) - rust-lang#104046 (bootstrap: add support for running Miri on a file) - rust-lang#104115 (Migrate crate-search element to CSS variables) - rust-lang#104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - rust-lang#104201 (Add check in GUI test for file loading failure) - rust-lang#104211 (:arrow_up: rust-analyzer) - rust-lang#104231 (Update mailmap) Failed merges: - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
Contributor
|
@bors r- Merge conflict not detected by homu(?) |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 10, 2022
…earth Rollup of 9 pull requests Successful merges: - rust-lang#101939 (Add loongarch64 abi support) - rust-lang#103863 (Use `TraitEngine` in more places, restrict visibility of `FulfillmentCtxt` constructor) - rust-lang#104036 (Suggest `is_some` when we've found `Option` but expected `bool`) - rust-lang#104060 (Make `Hash`, `Hasher` and `BuildHasher` `#[const_trait]` and make `Sip` const `Hasher`) - rust-lang#104077 (Use aapcs for efiapi calling convention on arm) - rust-lang#104186 (Tighten the 'introduce new binding' suggestion) - rust-lang#104194 (`EarlyBinder` docs) - rust-lang#104233 (Don't ICE when encountering `ConstKind::Error` in `RequiredConstsVisitor`) - rust-lang#104235 (Use `const_error_with_guaranteed` more) Failed merges: - rust-lang#104078 (Print "Checking/Building ..." message even when --dry-run is passed) - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
Collaborator
|
☔ The latest upstream changes (presumably #104236) made this pull request unmergeable. Please resolve the merge conflicts. |
d2485d4 to
149ab45
Compare
Member
Author
Just slow on the update. ;) Fixed the merge conflict. |
Member
Author
|
@bors r=notriddle rollup |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Nov 11, 2022
Rollup of 9 pull requests Successful merges: - rust-lang#100633 (Consider `#[must_use]` annotation on `async fn` as also affecting the `Future::Output`) - rust-lang#103445 (`#[test]`: Point at return type if `Termination` bound is unsatisfied) - rust-lang#103924 (Fix broken link in description of error code E0706) - rust-lang#104146 (Retry binding TCP Socket in remote-test-server) - rust-lang#104169 (Migrate `:target` rules to use CSS variables) - rust-lang#104202 (Fix ICE rust-lang#103748) - rust-lang#104216 (Don't ICE on operator trait methods with generic methods) - rust-lang#104217 (Display help message when fluent arg was referenced incorrectly) - rust-lang#104245 (Reduce default configuration's dependency upon static libstdcpp library (rust-lang#103606)) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#102763 (Some diagnostic-related nits) - rust-lang#103443 (Parser: Recover from using colon as path separator in imports) - rust-lang#103675 (remove redundent "<>" for ty::Slice with reference type) - rust-lang#104046 (bootstrap: add support for running Miri on a file) - rust-lang#104115 (Migrate crate-search element to CSS variables) - rust-lang#104190 (Ignore "Change InferCtxtBuilder from enter to build" in git blame) - rust-lang#104201 (Add check in GUI test for file loading failure) - rust-lang#104211 (:arrow_up: rust-analyzer) - rust-lang#104231 (Update mailmap) Failed merges: - rust-lang#104169 (Migrate `:target` rules to use CSS variables) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There should be no GUI changes.
r? @notriddle