Skip to content

Commit c1b5249

Browse files
committed
Remove sanitizer_runtime attribute
1 parent 9d5208a commit c1b5249

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

-5
This file was deleted.

src/librustc/query/mod.rs

-4
Original file line numberDiff line numberDiff line change
@@ -639,10 +639,6 @@ rustc_queries! {
639639
fatal_cycle
640640
desc { "checking if the crate has_panic_handler" }
641641
}
642-
query is_sanitizer_runtime(_: CrateNum) -> bool {
643-
fatal_cycle
644-
desc { "query a crate is `#![sanitizer_runtime]`" }
645-
}
646642
query is_profiler_runtime(_: CrateNum) -> bool {
647643
fatal_cycle
648644
desc { "query a crate is `#![profiler_runtime]`" }

src/librustc_codegen_ssa/base.rs

-4
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,6 @@ impl CrateInfo {
707707
panic_runtime: None,
708708
compiler_builtins: None,
709709
profiler_runtime: None,
710-
sanitizer_runtime: None,
711710
is_no_builtins: Default::default(),
712711
native_libraries: Default::default(),
713712
used_libraries: tcx.native_libraries(LOCAL_CRATE),
@@ -743,9 +742,6 @@ impl CrateInfo {
743742
if tcx.is_profiler_runtime(cnum) {
744743
info.profiler_runtime = Some(cnum);
745744
}
746-
if tcx.is_sanitizer_runtime(cnum) {
747-
info.sanitizer_runtime = Some(cnum);
748-
}
749745
if tcx.is_no_builtins(cnum) {
750746
info.is_no_builtins.insert(cnum);
751747
}

src/librustc_codegen_ssa/lib.rs

-1
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

-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ provide! { <'tcx> tcx, def_id, other, cdata,
160160
is_compiler_builtins => { cdata.root.compiler_builtins }
161161
has_global_allocator => { cdata.root.has_global_allocator }
162162
has_panic_handler => { cdata.root.has_panic_handler }
163-
is_sanitizer_runtime => { cdata.root.sanitizer_runtime }
164163
is_profiler_runtime => { cdata.root.profiler_runtime }
165164
panic_strategy => { cdata.root.panic_strategy }
166165
extern_crate => {

src/librustc_metadata/encoder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,6 @@ impl<'tcx> EncodeContext<'tcx> {
519519
no_builtins: attr::contains_name(&attrs, sym::no_builtins),
520520
panic_runtime: attr::contains_name(&attrs, sym::panic_runtime),
521521
profiler_runtime: attr::contains_name(&attrs, sym::profiler_runtime),
522-
sanitizer_runtime: attr::contains_name(&attrs, sym::sanitizer_runtime),
523522
symbol_mangling_version: tcx.sess.opts.debugging_opts.symbol_mangling_version,
524523

525524
crate_deps,

src/librustc_metadata/schema.rs

-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ crate struct CrateRoot<'tcx> {
197197
pub no_builtins: bool,
198198
pub panic_runtime: bool,
199199
pub profiler_runtime: bool,
200-
pub sanitizer_runtime: bool,
201200
pub symbol_mangling_version: SymbolManglingVersion,
202201
}
203202

src/libsyntax/feature_gate/active.rs

-3
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

-5
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,6 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
396396
"the `#[compiler_builtins]` attribute is used to identify the `compiler_builtins` crate \
397397
which contains compiler-rt intrinsics and will never be stable",
398398
),
399-
gated!(
400-
sanitizer_runtime, Whitelisted, template!(Word),
401-
"the `#[sanitizer_runtime]` attribute is used to identify crates that contain the runtime \
402-
of a sanitizer and will never be stable",
403-
),
404399
gated!(
405400
profiler_runtime, Whitelisted, template!(Word),
406401
"the `#[profiler_runtime]` attribute is used to identify the `profiler_builtins` crate \

src/libsyntax/feature_gate/removed.rs

+2
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,

src/test/ui/feature-gates/feature-gate-sanitizer-runtime.rs

-3
This file was deleted.

src/test/ui/feature-gates/feature-gate-sanitizer-runtime.stderr

-11
This file was deleted.

0 commit comments

Comments
 (0)