Skip to content

Commit c051c5d

Browse files
committed
Auto merge of #83934 - Dylan-DPC:rollup-nw5dadn, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #82963 (Move `SharedContext` to `context.rs`) - #83829 (rustc_target: Rely on defaults more in target specs) - #83895 (Add listing of lints (eg via `-W help`) to rustdoc) - #83902 (Update LLVM to support more wasm simd ops) - #83903 (Fix typo in TokenStream documentation) - #83910 (Update cargo) - #83920 (Fix HashMap/HashSet LLDB pretty-printer after hashbrown 0.11.0) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 16143d1 + 3d33818 commit c051c5d

38 files changed

+137
-148
lines changed

compiler/rustc_ast/src/tokenstream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ impl<CTX> HashStable<CTX> for LazyTokenStream {
178178
/// The goal is for procedural macros to work with `TokenStream`s and `TokenTree`s
179179
/// instead of a representation of the abstract syntax tree.
180180
/// Today's `TokenTree`s can still contain AST via `token::Interpolated` for
181-
/// backwards compatability.
181+
/// backwards compatibility.
182182
#[derive(Clone, Debug, Default, Encodable, Decodable)]
183183
pub struct TokenStream(pub(crate) Lrc<Vec<TreeAndSpacing>>);
184184

compiler/rustc_driver/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,8 @@ the command line flag directly.
845845
);
846846
}
847847

848-
fn describe_lints(sess: &Session, lint_store: &LintStore, loaded_plugins: bool) {
848+
/// Write to stdout lint command options, together with a list of all available lints
849+
pub fn describe_lints(sess: &Session, lint_store: &LintStore, loaded_plugins: bool) {
849850
println!(
850851
"
851852
Available lint options:

compiler/rustc_target/src/spec/apple_base.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::env;
22

3-
use crate::spec::{LinkArgs, SplitDebuginfo, TargetOptions};
3+
use crate::spec::{SplitDebuginfo, TargetOptions};
44

55
pub fn opts(os: &str) -> TargetOptions {
66
// ELF TLS is only available in macOS 10.7+. If you try to compile for 10.6
@@ -27,10 +27,8 @@ pub fn opts(os: &str) -> TargetOptions {
2727
is_like_osx: true,
2828
dwarf_version: Some(2),
2929
has_rpath: true,
30-
dll_prefix: "lib".to_string(),
3130
dll_suffix: ".dylib".to_string(),
3231
archive_format: "darwin".to_string(),
33-
pre_link_args: LinkArgs::new(),
3432
has_elf_tls: version >= (10, 7),
3533
abi_return_struct_as_int: true,
3634
emit_debug_gdb_scripts: false,

compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pub fn target() -> Target {
1313

1414
options: TargetOptions {
1515
features: "+v7,+thumb2,+soft-float,-neon".to_string(),
16-
cpu: "generic".to_string(),
1716
max_atomic_width: Some(64),
1817
unsupported_abis: super::arm_base::unsupported_abis(),
1918
mcount: "\u{1}__gnu_mcount_nc".to_string(),

compiler/rustc_target/src/spec/armv7_unknown_linux_gnueabihf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ pub fn target() -> Target {
1414
options: TargetOptions {
1515
// Info about features at https://wiki.debian.org/ArmHardFloatPort
1616
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
17-
cpu: "generic".to_string(),
1817
max_atomic_width: Some(64),
1918
unsupported_abis: super::arm_base::unsupported_abis(),
2019
mcount: "\u{1}__gnu_mcount_nc".to_string(),

compiler/rustc_target/src/spec/armv7_unknown_linux_musleabi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ pub fn target() -> Target {
1818

1919
options: TargetOptions {
2020
features: "+v7,+thumb2,+soft-float,-neon".to_string(),
21-
cpu: "generic".to_string(),
2221
max_atomic_width: Some(64),
2322
unsupported_abis: super::arm_base::unsupported_abis(),
2423
mcount: "\u{1}mcount".to_string(),

compiler/rustc_target/src/spec/armv7_unknown_linux_musleabihf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ pub fn target() -> Target {
1717
// target.
1818
options: TargetOptions {
1919
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
20-
cpu: "generic".to_string(),
2120
max_atomic_width: Some(64),
2221
unsupported_abis: super::arm_base::unsupported_abis(),
2322
mcount: "\u{1}mcount".to_string(),

compiler/rustc_target/src/spec/armv7_unknown_netbsd_eabihf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pub fn target() -> Target {
1111
options: TargetOptions {
1212
env: "eabihf".to_string(),
1313
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
14-
cpu: "generic".to_string(),
1514
max_atomic_width: Some(64),
1615
unsupported_abis: super::arm_base::unsupported_abis(),
1716
mcount: "__mcount".to_string(),

compiler/rustc_target/src/spec/armv7_wrs_vxworks_eabihf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub fn target() -> Target {
1010
options: TargetOptions {
1111
// Info about features at https://wiki.debian.org/ArmHardFloatPort
1212
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
13-
cpu: "generic".to_string(),
1413
max_atomic_width: Some(64),
1514
unsupported_abis: super::arm_base::unsupported_abis(),
1615
..base

compiler/rustc_target/src/spec/avr_gnu_base.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ pub fn target(target_cpu: String) -> Target {
1515
exe_suffix: ".elf".to_string(),
1616

1717
linker: Some("avr-gcc".to_owned()),
18-
dynamic_linking: false,
1918
executables: true,
2019
linker_is_gnu: true,
21-
has_rpath: false,
22-
position_independent_executables: false,
2320
eh_frame_header: false,
2421
pre_link_args: vec![(LinkerFlavor::Gcc, vec![format!("-mmcu={}", target_cpu)])]
2522
.into_iter()

0 commit comments

Comments
 (0)