From 77c32e9a3e1c835d565ccb4be2a6c5c92023b158 Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Sun, 16 Dec 2018 22:37:45 -0800 Subject: [PATCH] Properly infer full_docs 3efe567b9ede ("Enhanced hover tooltips") added the `full_docs` configuration option as an `Inferrable`. However, it failed to actually merge the option during a config update, causing a panic if the client specified `full_docs` to be `null`. Example panic: thread '' panicked at 'internal error: entered unreachable code', src/config.rs:111:33 Fix this to prevent the crash. --- src/config.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config.rs b/src/config.rs index d171addc4a1..ba0c211927e 100644 --- a/src/config.rs +++ b/src/config.rs @@ -206,6 +206,7 @@ impl Config { new.target_dir = self.target_dir.combine_with_default(&new.target_dir, None); new.build_lib = self.build_lib.combine_with_default(&new.build_lib, false); new.build_bin = self.build_bin.combine_with_default(&new.build_bin, None); + new.full_docs = self.full_docs.combine_with_default(&new.full_docs, false); *self = new; }