Skip to content

Commit 93c5639

Browse files
committed
Remove sanitizer_runtime attribute
1 parent e216b65 commit 93c5639

File tree

12 files changed

+2
-39
lines changed

12 files changed

+2
-39
lines changed

src/doc/unstable-book/src/library-features/sanitizer-runtime-lib.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/librustc/query/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,6 @@ rustc_queries! {
642642
fatal_cycle
643643
desc { "checking if the crate has_panic_handler" }
644644
}
645-
query is_sanitizer_runtime(_: CrateNum) -> bool {
646-
fatal_cycle
647-
desc { "query a crate is `#![sanitizer_runtime]`" }
648-
}
649645
query is_profiler_runtime(_: CrateNum) -> bool {
650646
fatal_cycle
651647
desc { "query a crate is `#![profiler_runtime]`" }

src/librustc_codegen_ssa/base.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,6 @@ impl CrateInfo {
721721
panic_runtime: None,
722722
compiler_builtins: None,
723723
profiler_runtime: None,
724-
sanitizer_runtime: None,
725724
is_no_builtins: Default::default(),
726725
native_libraries: Default::default(),
727726
used_libraries: tcx.native_libraries(LOCAL_CRATE),
@@ -757,9 +756,6 @@ impl CrateInfo {
757756
if tcx.is_profiler_runtime(cnum) {
758757
info.profiler_runtime = Some(cnum);
759758
}
760-
if tcx.is_sanitizer_runtime(cnum) {
761-
info.sanitizer_runtime = Some(cnum);
762-
}
763759
if tcx.is_no_builtins(cnum) {
764760
info.is_no_builtins.insert(cnum);
765761
}

src/librustc_codegen_ssa/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ pub struct CrateInfo {
130130
pub panic_runtime: Option<CrateNum>,
131131
pub compiler_builtins: Option<CrateNum>,
132132
pub profiler_runtime: Option<CrateNum>,
133-
pub sanitizer_runtime: Option<CrateNum>,
134133
pub is_no_builtins: FxHashSet<CrateNum>,
135134
pub native_libraries: FxHashMap<CrateNum, Lrc<Vec<NativeLibrary>>>,
136135
pub crate_name: FxHashMap<CrateNum, String>,

src/librustc_metadata/cstore_impl.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ provide! { <'tcx> tcx, def_id, other, cdata,
157157
is_compiler_builtins => { cdata.root.compiler_builtins }
158158
has_global_allocator => { cdata.root.has_global_allocator }
159159
has_panic_handler => { cdata.root.has_panic_handler }
160-
is_sanitizer_runtime => { cdata.root.sanitizer_runtime }
161160
is_profiler_runtime => { cdata.root.profiler_runtime }
162161
panic_strategy => { cdata.root.panic_strategy }
163162
extern_crate => {

src/librustc_metadata/encoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@ impl<'tcx> EncodeContext<'tcx> {
566566
no_builtins: attr::contains_name(&attrs, sym::no_builtins),
567567
panic_runtime: attr::contains_name(&attrs, sym::panic_runtime),
568568
profiler_runtime: attr::contains_name(&attrs, sym::profiler_runtime),
569-
sanitizer_runtime: attr::contains_name(&attrs, sym::sanitizer_runtime),
570569
symbol_mangling_version: tcx.sess.opts.debugging_opts.symbol_mangling_version,
571570

572571
crate_deps,

src/librustc_metadata/schema.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ crate struct CrateRoot<'tcx> {
209209
pub no_builtins: bool,
210210
pub panic_runtime: bool,
211211
pub profiler_runtime: bool,
212-
pub sanitizer_runtime: bool,
213212
pub symbol_mangling_version: SymbolManglingVersion,
214213
}
215214

src/libsyntax/feature_gate/active.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,6 @@ declare_features! (
198198
/// Allows using the `unadjusted` ABI; perma-unstable.
199199
(active, abi_unadjusted, "1.16.0", None, None),
200200

201-
/// Allows identifying crates that contain sanitizer runtimes.
202-
(active, sanitizer_runtime, "1.17.0", None, None),
203-
204201
/// Used to identify crates that contain the profiler runtime.
205202
(active, profiler_runtime, "1.18.0", None, None),
206203

src/libsyntax/feature_gate/builtin_attrs.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -400,11 +400,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
400400
"the `#[compiler_builtins]` attribute is used to identify the `compiler_builtins` crate \
401401
which contains compiler-rt intrinsics and will never be stable",
402402
),
403-
gated!(
404-
sanitizer_runtime, Whitelisted, template!(Word),
405-
"the `#[sanitizer_runtime]` attribute is used to identify crates that contain the runtime \
406-
of a sanitizer and will never be stable",
407-
),
408403
gated!(
409404
profiler_runtime, Whitelisted, template!(Word),
410405
"the `#[profiler_runtime]` attribute is used to identify the `profiler_builtins` crate \

src/libsyntax/feature_gate/removed.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ declare_features! (
7070
(removed, pushpop_unsafe, "1.2.0", None, None, None),
7171
(removed, needs_allocator, "1.4.0", Some(27389), None,
7272
Some("subsumed by `#![feature(allocator_internals)]`")),
73+
/// Allows identifying crates that contain sanitizer runtimes.
74+
(removed, sanitizer_runtime, "1.17.0", None, None, None),
7375
(removed, proc_macro_mod, "1.27.0", Some(54727), None,
7476
Some("subsumed by `#![feature(proc_macro_hygiene)]`")),
7577
(removed, proc_macro_expr, "1.27.0", Some(54727), None,

0 commit comments

Comments
 (0)