Skip to content

Commit c6e4db6

Browse files
committedSep 25, 2020
Auto merge of rust-lang#77198 - jonas-schievink:rollup-i59i41h, r=jonas-schievink
Rollup of 15 pull requests Successful merges: - rust-lang#76932 (Relax promises about condition variable.) - rust-lang#76973 (Unstably allow assume intrinsic in const contexts) - rust-lang#77005 (BtreeMap: refactoring around edges) - rust-lang#77066 (Fix dest prop miscompilation around references) - rust-lang#77073 (dead_code: look at trait impls even if they don't contain items) - rust-lang#77086 (Include libunwind in the rust-src component.) - rust-lang#77097 (Make [].as_[mut_]ptr_range() (unstably) const.) - rust-lang#77106 (clarify that `changelog-seen = 1` goes to the beginning of config.toml) - rust-lang#77120 (Add `--keep-stage-std` to `x.py` for keeping only standard library artifacts) - rust-lang#77126 (Invalidate local LLVM cache less often) - rust-lang#77146 (Install std for non-host targets) - rust-lang#77155 (remove enum name from ImplSource variants) - rust-lang#77176 (Removing erroneous semicolon in transmute documentation) - rust-lang#77183 (Allow multiple allow_internal_unstable attributes) - rust-lang#77189 (Remove extra space from vec drawing) Failed merges: r? `@ghost`
2 parents 10ef7f9 + d72b7cc commit c6e4db6

File tree

45 files changed

+576
-452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+576
-452
lines changed
 

‎compiler/rustc_attr/src/builtin.rs

+14-7
Original file line numberDiff line numberDiff line change
@@ -1022,14 +1022,21 @@ pub fn find_transparency(
10221022

10231023
pub fn allow_internal_unstable<'a>(
10241024
sess: &'a Session,
1025-
attrs: &[Attribute],
1025+
attrs: &'a [Attribute],
10261026
) -> Option<impl Iterator<Item = Symbol> + 'a> {
1027-
let attr = sess.find_by_name(attrs, sym::allow_internal_unstable)?;
1028-
let list = attr.meta_item_list().or_else(|| {
1029-
sess.diagnostic()
1030-
.span_err(attr.span, "allow_internal_unstable expects list of feature names");
1031-
None
1032-
})?;
1027+
let attrs = sess.filter_by_name(attrs, sym::allow_internal_unstable);
1028+
let list = attrs
1029+
.filter_map(move |attr| {
1030+
attr.meta_item_list().or_else(|| {
1031+
sess.diagnostic().span_err(
1032+
attr.span,
1033+
"`allow_internal_unstable` expects a list of feature names",
1034+
);
1035+
None
1036+
})
1037+
})
1038+
.flatten();
1039+
10331040
Some(list.into_iter().filter_map(move |it| {
10341041
let name = it.ident().map(|ident| ident.name);
10351042
if name.is_none() {

‎compiler/rustc_codegen_ssa/src/traits/intrinsic.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ use rustc_span::Span;
55
use rustc_target::abi::call::FnAbi;
66

77
pub trait IntrinsicCallMethods<'tcx>: BackendTypes {
8-
/// Remember to add all intrinsics here, in librustc_typeck/check/mod.rs,
9-
/// and in libcore/intrinsics.rs; if you need access to any llvm intrinsics,
10-
/// add them to librustc_codegen_llvm/context.rs
8+
/// Remember to add all intrinsics here, in `compiler/rustc_typeck/src/check/mod.rs`,
9+
/// and in `library/core/src/intrinsics.rs`; if you need access to any LLVM intrinsics,
10+
/// add them to `compiler/rustc_codegen_llvm/src/context.rs`.
1111
fn codegen_intrinsic_call(
1212
&mut self,
1313
instance: ty::Instance<'tcx>,

0 commit comments

Comments
 (0)
Please sign in to comment.