diff options
| author | Kyle Lin <minecraft.kyle.train@gmail.com> | 2023-07-03 23:34:38 +0800 |
|---|---|---|
| committer | Kyle Lin <minecraft.kyle.train@gmail.com> | 2023-08-18 15:31:13 +0800 |
| commit | 4896fc0f5919d7facee3ce77e089495cc133dc74 (patch) | |
| tree | 76dc4e0cccc69494ccd7a8347188573ca2bfcfaf | |
| parent | c4afb8a8684aceabf54030c7e2648494d3c9bbe2 (diff) | |
| download | rust-4896fc0f5919d7facee3ce77e089495cc133dc74.tar.gz rust-4896fc0f5919d7facee3ce77e089495cc133dc74.zip | |
resolve conflicts
| -rw-r--r-- | library/std/src/lib.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index ac4ce222fba..58684ffe500 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -223,6 +223,7 @@ #![cfg_attr(not(bootstrap), allow(internal_features))] #![deny(rustc::existing_doc_keyword)] #![deny(fuzzy_provenance_casts)] +#![cfg_attr(not(bootstrap), allow(rustdoc::redundant_explicit_links))] // Ensure that std can be linked against panic_abort despite compiled with `-C panic=unwind` #![deny(ffi_unwind_calls)] // std may use features in a platform-specific way |