Skip to content

rustc_session cleanups #118472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 1, 2023
Merged

rustc_session cleanups #118472

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
866aa2d
Remove unused features.
nnethercote Nov 28, 2023
3521abd
Reorder some `use` items.
nnethercote Nov 28, 2023
99ac405
Move `MetadataLoader{,Dyn}` to `rustc_metadata`.
nnethercote Nov 28, 2023
c5408b6
Remove unused `FileMatch`.
nnethercote Nov 28, 2023
f8ce186
Update a comment.
nnethercote Nov 28, 2023
dba9416
Move `is_ascii_ident` to where it's used.
nnethercote Nov 28, 2023
24d4fe4
Improve integer interning in `default_configuration`.
nnethercote Nov 29, 2023
20046ce
Sort `PRINT_KINDS`.
nnethercote Nov 29, 2023
b6d0493
Inline and remove `select_debuginfo_compression`.
nnethercote Nov 29, 2023
5f11d19
Reduce `pub` exposure.
nnethercote Nov 28, 2023
4b90b26
Move `WasiExecModel`.
nnethercote Nov 29, 2023
e065d96
Remove unused field from `IncrCompSession`.
nnethercote Nov 30, 2023
275b793
Clarify the `lockfile` field in `IncrCompSession`.
nnethercote Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions compiler/rustc_session/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ fn default_configuration(sess: &Session) -> Cfg {
// NOTE: This should be kept in sync with `CheckCfg::fill_well_known` below.
let end = &sess.target.endian;
let arch = &sess.target.arch;
let wordsz = sess.target.pointer_width.to_string();
let wordsz = sess.target.pointer_width as u64;
let os = &sess.target.os;
let env = &sess.target.env;
let abi = &sess.target.abi;
Expand All @@ -1273,7 +1273,7 @@ fn default_configuration(sess: &Session) -> Cfg {
}
ret.insert((sym::target_arch, Some(Symbol::intern(arch))));
ret.insert((sym::target_endian, Some(Symbol::intern(end.as_str()))));
ret.insert((sym::target_pointer_width, Some(Symbol::intern(&wordsz))));
ret.insert((sym::target_pointer_width, Some(sym::integer(wordsz))));
ret.insert((sym::target_env, Some(Symbol::intern(env))));
ret.insert((sym::target_abi, Some(Symbol::intern(abi))));
if sess.is_nightly_build() {
Expand All @@ -1293,19 +1293,18 @@ fn default_configuration(sess: &Session) -> Cfg {
] {
if i >= min_atomic_width && i <= max_atomic_width {
has_atomic = true;
let mut insert_atomic = |s, align: Align| {
ret.insert((sym::target_has_atomic_load_store, Some(Symbol::intern(s))));
let mut insert_atomic = |sym, align: Align| {
ret.insert((sym::target_has_atomic_load_store, Some(sym)));
if atomic_cas {
ret.insert((sym::target_has_atomic, Some(Symbol::intern(s))));
ret.insert((sym::target_has_atomic, Some(sym)));
}
if align.bits() == i {
ret.insert((sym::target_has_atomic_equal_alignment, Some(Symbol::intern(s))));
ret.insert((sym::target_has_atomic_equal_alignment, Some(sym)));
}
};
let s = i.to_string();
insert_atomic(&s, align);
if s == wordsz {
insert_atomic("ptr", layout.pointer_align.abi);
insert_atomic(sym::integer(i), align);
if wordsz == i {
insert_atomic(sym::ptr, layout.pointer_align.abi);
}
}
}
Expand Down