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 RLS #63491

Merged
merged 1 commit into from Aug 17, 2019

Conversation

@Xanewok
Copy link
Member

commented Aug 12, 2019

This fixes handling default configuration for the crate_blacklist
RLS configuration.

Technically this isn't needed, as the VS Code extension can be
configured to accept a predefined blacklist that's equal to the default
one but it's best that it also lands so that we don't need to work
around that.

Without this, manually passing a null value as the configuration
unfortunately crashes the RLS. This is the last fix related to configuration.

cc #63472

r? @Mark-Simulacrum

Update RLS
This fixes handling default configuration for the `crate_blacklist`
RLS configuration.

Technically this isn't needed, as the VS Code extension can be
configured to accept a predefined blacklist that's equal to the default
one but it's best that it also lands so that we don't need to work
around that.

cc #63472
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 12, 2019

⚠️ Warning ⚠️

  • These commits modify submodules.
@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

commented Aug 12, 2019

@bors r+ p=1

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 12, 2019

📌 Commit 5124f34 has been approved by Mark-Simulacrum

@Xanewok

This comment has been minimized.

Copy link
Member Author

commented Aug 13, 2019

This doesn't update Cargo.toml and is a small and safe update, so I'd say it's also safe to...

@bors rollup

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Aug 14, 2019

Rollup merge of rust-lang#63491 - Xanewok:update-rls, r=Mark-Simulacrum
Update RLS

This fixes handling default configuration for the `crate_blacklist`
RLS configuration.

Technically this isn't needed, as the VS Code extension can be
configured to accept a predefined blacklist that's equal to the default
one but it's best that it also lands so that we don't need to work
around that.

Without this, manually passing a `null` value as the configuration
unfortunately crashes the RLS. This is the last fix related to configuration.

cc rust-lang#63472

r? @Mark-Simulacrum

bors added a commit that referenced this pull request Aug 14, 2019

Auto merge of #63540 - Mark-Simulacrum:rollup-t0qq657, r=Mark-Simulacrum
Rollup of 11 pull requests

Successful merges:

 - #62760 (Deduplicate error messages in `librsctc_mir`)
 - #62849 (typeck: Prohibit RPIT types that inherit lifetimes)
 - #63383 (`async fn` lifetime elision tests)
 - #63421 (Implement Clone, Display for ascii::EscapeDefault)
 - #63459 (syntax: account for CVarArgs being in the argument list.)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63475 (Bring back suggestion for splitting `<-` into `< -`)
 - #63485 (ci: move mirrors to their standalone bucket)
 - #63488 (improve DiagnosticBuilder docs)
 - #63491 (Update RLS)
 - #63534 (Bump to 1.39)

Failed merges:

 - #63487 (Remove meaningless comments in src/test)

r? @ghost

Centril added a commit to Centril/rust that referenced this pull request Aug 15, 2019

Rollup merge of rust-lang#63491 - Xanewok:update-rls, r=Mark-Simulacrum
Update RLS

This fixes handling default configuration for the `crate_blacklist`
RLS configuration.

Technically this isn't needed, as the VS Code extension can be
configured to accept a predefined blacklist that's equal to the default
one but it's best that it also lands so that we don't need to work
around that.

Without this, manually passing a `null` value as the configuration
unfortunately crashes the RLS. This is the last fix related to configuration.

cc rust-lang#63472

r? @Mark-Simulacrum

bors added a commit that referenced this pull request Aug 15, 2019

Auto merge of #63583 - Centril:rollup-5s17x9k, r=Centril
Rollup of 8 pull requests

Successful merges:

 - #63155 (Add UWP MSVC targets)
 - #63165 (Add builtin targets for mips64(el)-unknown-linux-muslabi64)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63470 (Utilize -Zbinary-dep-depinfo in rustbuild)
 - #63491 (Update RLS)
 - #63559 (rustc_codegen_utils: account for 1-indexed anonymous lifetimes in v0 mangling.)
 - #63572 (remove unused Level::PhaseFatal)
 - #63577 (Test HRTB issue accepted by compiler)

Failed merges:

r? @ghost
@Centril

This comment has been minimized.

Copy link
Member

commented Aug 16, 2019

@bors rollup-

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 17, 2019

⌛️ Testing commit 5124f34 with merge e910be8...

bors added a commit that referenced this pull request Aug 17, 2019

Auto merge of #63491 - Xanewok:update-rls, r=Mark-Simulacrum
Update RLS

This fixes handling default configuration for the `crate_blacklist`
RLS configuration.

Technically this isn't needed, as the VS Code extension can be
configured to accept a predefined blacklist that's equal to the default
one but it's best that it also lands so that we don't need to work
around that.

Without this, manually passing a `null` value as the configuration
unfortunately crashes the RLS. This is the last fix related to configuration.

cc #63472

r? @Mark-Simulacrum
@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 17, 2019

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing e910be8 to master...

@bors bors added the merged-by-bors label Aug 17, 2019

@bors bors merged commit 5124f34 into rust-lang:master Aug 17, 2019

4 of 5 checks passed

pr (LinuxTools)
Details
homu Test successful
Details
pr Build #20190812.23 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.