Skip to content

Commit c351775

Browse files
committedSep 23, 2020
Auto merge of rust-lang#77102 - Dylan-DPC:rollup-2jfrg3u, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - rust-lang#76898 (Record `tcx.def_span` instead of `item.span` in crate metadata) - rust-lang#76939 (emit errors during AbstractConst building) - rust-lang#76965 (Add cfg(target_has_atomic_equal_alignment) and use it for Atomic::from_mut.) - rust-lang#76993 (Changing the alloc() to accept &self instead of &mut self) - rust-lang#76994 (fix small typo in docs and comments) - rust-lang#77017 (Add missing examples on Vec iter types) - rust-lang#77042 (Improve documentation for ToSocketAddrs) - rust-lang#77047 (Miri: more informative deallocation error messages) - rust-lang#77055 (Add #[track_caller] to more panicking Cell functions) Failed merges: r? `@ghost`
2 parents 8b40853 + c3c03f2 commit c351775

File tree

42 files changed

+552
-199
lines changed

Some content is hidden

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

42 files changed

+552
-199
lines changed
 

‎compiler/rustc_feature/src/builtin_attrs.rs

+5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ const GATED_CFGS: &[GatedCfg] = &[
2626
(sym::target_thread_local, sym::cfg_target_thread_local, cfg_fn!(cfg_target_thread_local)),
2727
(sym::target_has_atomic, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)),
2828
(sym::target_has_atomic_load_store, sym::cfg_target_has_atomic, cfg_fn!(cfg_target_has_atomic)),
29+
(
30+
sym::target_has_atomic_equal_alignment,
31+
sym::cfg_target_has_atomic,
32+
cfg_fn!(cfg_target_has_atomic),
33+
),
2934
(sym::sanitize, sym::cfg_sanitize, cfg_fn!(cfg_sanitize)),
3035
(sym::version, sym::cfg_version, cfg_fn!(cfg_version)),
3136
];

‎compiler/rustc_lint/src/types.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@ fn get_nullable_type<'tcx>(cx: &LateContext<'tcx>, ty: Ty<'tcx>) -> Option<Ty<'t
733733
}
734734

735735
/// Check if this enum can be safely exported based on the "nullable pointer optimization". If it
736-
/// can, return the the type that `ty` can be safely converted to, otherwise return `None`.
736+
/// can, return the type that `ty` can be safely converted to, otherwise return `None`.
737737
/// Currently restricted to function pointers, boxes, references, `core::num::NonZero*`,
738738
/// `core::ptr::NonNull`, and `#[repr(transparent)]` newtypes.
739739
/// FIXME: This duplicates code in codegen.

0 commit comments

Comments
 (0)
Please sign in to comment.