diff --git a/build.rs b/build.rs index be655f51c..2e5bd948b 100644 --- a/build.rs +++ b/build.rs @@ -12,11 +12,11 @@ fn main() { // language server. let build_dir = format!("{}/build", env!("CARGO_MANIFEST_DIR")); let build_dir = option_env!("FISH_BUILD_DIR").unwrap_or(&build_dir); - rsconf::set_env_value("FISH_BUILD_DIR", &build_dir); + rsconf::set_env_value("FISH_BUILD_DIR", build_dir); cc::Build::new() .file("src/libc.c") - .include(&build_dir) + .include(build_dir) .compile("flibc.a"); let mut build = cc::Build::new(); diff --git a/src/color.rs b/src/color.rs index 000b45d6c..fa48dd1f8 100644 --- a/src/color.rs +++ b/src/color.rs @@ -448,7 +448,7 @@ mod tests { #[test] fn parse_rgb() { - assert!(RgbColor::from_wstr(L!("##FF00A0")) == None); + assert!(RgbColor::from_wstr(L!("##FF00A0")).is_none()); assert!(RgbColor::from_wstr(L!("#FF00A0")) == Some(RgbColor::from_rgb(0xff, 0x00, 0xa0))); assert!(RgbColor::from_wstr(L!("FF00A0")) == Some(RgbColor::from_rgb(0xff, 0x00, 0xa0))); assert!(RgbColor::from_wstr(L!("FAF")) == Some(RgbColor::from_rgb(0xff, 0xaa, 0xff)));