diff options
| author | bors <bors@rust-lang.org> | 2020-03-29 14:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-29 14:48:58 +0000 |
| commit | 285519d412ef9c65df3bcd2de2b1a3d6ca16a255 (patch) | |
| tree | 27bae9b4daff1595d72f320e89353f4aa817391c /src/librustc_codegen_llvm | |
| parent | 8ab82b87af4f20b6c0a481e050517103d50263e9 (diff) | |
| parent | b851591731ef4e8017672e1e94ea55a44396d593 (diff) | |
| download | rust-285519d412ef9c65df3bcd2de2b1a3d6ca16a255.tar.gz rust-285519d412ef9c65df3bcd2de2b1a3d6ca16a255.zip | |
Auto merge of #70534 - Centril:rollup-t59tcx2, r=Centril
Rollup of 3 pull requests Successful merges: - #70140 (Add Result<Result<T, E>, E>::flatten -> Result<T, E>) - #70526 (reduce `rustc_attr` usage in places) - #70527 (Update LLVM submodule) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/attributes.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/attributes.rs b/src/librustc_codegen_llvm/attributes.rs index 072607fff85..a7417685c5c 100644 --- a/src/librustc_codegen_llvm/attributes.rs +++ b/src/librustc_codegen_llvm/attributes.rs @@ -21,7 +21,7 @@ use crate::attributes; use crate::llvm::AttributePlace::Function; use crate::llvm::{self, Attribute}; use crate::llvm_util; -pub use rustc_attr::{self as attr, InlineAttr, OptimizeAttr}; +pub use rustc_attr::{InlineAttr, OptimizeAttr}; use crate::context::CodegenCx; use crate::value::Value; |