Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 04:53:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5228

Browse source 
5228: Fix typo r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-05 09:24:58 +00:00 committed by GitHub
commit 8b0983e89a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/rust-analyzer/src/config.rs
View file

@ -67,20 +67,20 @@ impl From<ProjectJson> for LinkedProject {
pub struct LensConfig { pub struct LensConfig {
pub run: bool, pub run: bool,
pub debug: bool, pub debug: bool,
pub impementations: bool, pub implementations: bool,
} }
impl Default for LensConfig { impl Default for LensConfig {
fn default() -> Self { fn default() -> Self {
Self { run: true, debug: true, impementations: true } Self { run: true, debug: true, implementations: true }
} }
} }
impl LensConfig { impl LensConfig {
pub const NO_LENS: LensConfig = Self { run: false, debug: false, impementations: false }; pub const NO_LENS: LensConfig = Self { run: false, debug: false, implementations: false };
pub fn any(&self) -> bool { pub fn any(&self) -> bool {
self.impementations || self.runnable() self.implementations || self.runnable()
} }
pub fn none(&self) -> bool { pub fn none(&self) -> bool {
@ -272,7 +272,7 @@ impl Config {
if lens_enabled { if lens_enabled {
set(value, "/lens/run", &mut self.lens.run); set(value, "/lens/run", &mut self.lens.run);
set(value, "/lens/debug", &mut self.lens.debug); set(value, "/lens/debug", &mut self.lens.debug);
set(value, "/lens/implementations", &mut self.lens.impementations); set(value, "/lens/implementations", &mut self.lens.implementations);
} else { } else {
self.lens = LensConfig::NO_LENS; self.lens = LensConfig::NO_LENS;
} }

2
crates/rust-analyzer/src/handlers.rs
View file

@ -865,7 +865,7 @@ pub(crate) fn handle_code_lens(
} }
} }
if snap.config.lens.impementations { if snap.config.lens.implementations {
// Handle impls // Handle impls
lenses.extend( lenses.extend(
snap.analysis snap.analysis