Skip to content

Commit 2c3f3b3

Browse files
author
Ariel Ben-Yehuda
committed
enforcable -> enforceable
1 parent c359273 commit 2c3f3b3

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

compiler/rustc_metadata/src/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use rustc_middle::ty::data_structures::IndexSet;
2525
use rustc_middle::ty::{TyCtxt, TyCtxtFeed};
2626
use rustc_proc_macro::bridge::client::ProcMacro;
2727
use rustc_session::Session;
28-
use rustc_session::config::enforcable_mitigations::DeniedPartialMitigationLevel;
28+
use rustc_session::config::enforceable_mitigations::DeniedPartialMitigationLevel;
2929
use rustc_session::config::{
3030
CrateType, ExtendedTargetModifierInfo, ExternLocation, Externs, OptionsTargetModifiers,
3131
TargetModifier,

compiler/rustc_metadata/src/rmeta/decoder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use rustc_serialize::opaque::MemDecoder;
3030
use rustc_serialize::{Decodable, Decoder};
3131
use rustc_session::Session;
3232
use rustc_session::config::TargetModifier;
33-
use rustc_session::config::enforcable_mitigations::DeniedPartialMitigation;
33+
use rustc_session::config::enforceable_mitigations::DeniedPartialMitigation;
3434
use rustc_session::cstore::{CrateSource, ExternCrate};
3535
use rustc_span::hygiene::HygieneDecodeContext;
3636
use rustc_span::{
@@ -80,7 +80,7 @@ pub(crate) type CrateNumMap = IndexVec<CrateNum, CrateNum>;
8080
/// Target modifiers - abi or exploit mitigations flags that cause unsoundness when mixed
8181
pub(crate) type TargetModifiers = Vec<TargetModifier>;
8282

83-
/// The set of enforcable mitigations (RFC 3855) that are currently enabled for this crate
83+
/// The set of enforceable mitigations (RFC 3855) that are currently enabled for this crate
8484
pub(crate) type DeniedPartialMitigations = Vec<DeniedPartialMitigation>;
8585

8686
pub(crate) struct CrateMetadata {

compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use rustc_middle::ty::codec::TyEncoder;
2727
use rustc_middle::ty::fast_reject::{self, TreatParams};
2828
use rustc_middle::{bug, span_bug};
2929
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder, opaque};
30-
use rustc_session::config::enforcable_mitigations::DeniedPartialMitigation;
30+
use rustc_session::config::enforceable_mitigations::DeniedPartialMitigation;
3131
use rustc_session::config::{CrateType, OptLevel, TargetModifier};
3232
use rustc_span::hygiene::HygieneEncodeContext;
3333
use rustc_span::{

compiler/rustc_metadata/src/rmeta/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use rustc_middle::ty::fast_reject::SimplifiedType;
3434
use rustc_middle::ty::{self, Ty, TyCtxt, UnusedGenericParams};
3535
use rustc_middle::util::Providers;
3636
use rustc_serialize::opaque::FileEncoder;
37-
use rustc_session::config::enforcable_mitigations::DeniedPartialMitigation;
37+
use rustc_session::config::enforceable_mitigations::DeniedPartialMitigation;
3838
use rustc_session::config::{SymbolManglingVersion, TargetModifier};
3939
use rustc_session::cstore::{CrateDepKind, ForeignModule, LinkagePreference, NativeLib};
4040
use rustc_span::edition::Edition;

compiler/rustc_metadata/src/rmeta/parameterized.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ trivially_parameterized_over_tcx! {
117117
rustc_middle::ty::adjustment::CoerceUnsizedInfo,
118118
rustc_middle::ty::fast_reject::SimplifiedType,
119119
rustc_session::config::TargetModifier,
120-
rustc_session::config::enforcable_mitigations::DeniedPartialMitigation,
120+
rustc_session::config::enforceable_mitigations::DeniedPartialMitigation,
121121
rustc_session::cstore::ForeignModule,
122122
rustc_session::cstore::LinkagePreference,
123123
rustc_session::cstore::NativeLib,

compiler/rustc_session/src/options.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use rustc_target::spec::{
1919
TargetTuple, TlsModel,
2020
};
2121

22-
use crate::config::enforcable_mitigations::MitigationEnablement;
22+
use crate::config::enforceable_mitigations::MitigationEnablement;
2323
use crate::config::*;
2424
use crate::search_paths::SearchPath;
2525
use crate::utils::NativeLib;
@@ -84,7 +84,7 @@ pub struct TargetModifier {
8484
pub value_name: String,
8585
}
8686

87-
pub mod enforcable_mitigations;
87+
pub mod enforceable_mitigations;
8888

8989
mod target_modifier_consistency_check {
9090
use super::*;
@@ -887,16 +887,16 @@ mod desc {
887887
"either a boolean (`yes`, `no`, `on`, `off`, etc), or `nll` (default: `nll`)";
888888
pub(crate) const parse_align: &str = "a number that is a power of 2 between 1 and 2^29";
889889
pub(crate) const parse_allow_partial_mitigations: &str =
890-
super::enforcable_mitigations::DeniedPartialMitigationKind::KINDS;
890+
super::enforceable_mitigations::DeniedPartialMitigationKind::KINDS;
891891
pub(crate) const parse_deny_partial_mitigations: &str =
892-
super::enforcable_mitigations::DeniedPartialMitigationKind::KINDS;
892+
super::enforceable_mitigations::DeniedPartialMitigationKind::KINDS;
893893
}
894894

895895
pub mod parse {
896896
use std::str::FromStr;
897897

898898
pub(crate) use super::*;
899-
use crate::config::enforcable_mitigations::MitigationEnablement;
899+
use crate::config::enforceable_mitigations::MitigationEnablement;
900900
pub(crate) const MAX_THREADS_CAP: usize = 256;
901901

902902
/// This is for boolean options that don't take a value, and are true simply

compiler/rustc_session/src/options/enforcable_mitigations.rs renamed to compiler/rustc_session/src/options/enforceable_mitigations.rs

File renamed without changes.

0 commit comments

Comments
 (0)