diff --git a/.atom-build.yml b/.atom-build.yml
deleted file mode 100644
index a31bc877c9f5..000000000000
--- a/.atom-build.yml
+++ /dev/null
@@ -1 +0,0 @@
-cmd: ./x.py -i check
diff --git a/src/librustc_codegen_llvm/builder.rs b/src/librustc_codegen_llvm/builder.rs
index 47c5315e0b59..601c97d0c791 100644
--- a/src/librustc_codegen_llvm/builder.rs
+++ b/src/librustc_codegen_llvm/builder.rs
@@ -32,7 +32,7 @@ pub struct Builder<'a, 'll: 'a, 'tcx: 'll, V: 'll = &'ll value::Value> {
     pub cx: &'a CodegenCx<'ll, 'tcx, V>,
 }
 
-impl<V> Drop for Builder<'_, '_, '_, V> {
+impl<V> Drop for Builder<'a, 'll, 'tcx, V> {
     fn drop(&mut self) {
         unsafe {
             llvm::LLVMDisposeBuilder(&mut *(self.llbuilder as *mut _));