bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #134666 - matthiaskrgr:rollup-whe0chp, r=matthiaskrgr

Browse source 
Rollup of 6 pull requests

Successful merges:

 - #130289 (docs: Permissions.readonly() also ignores root user special permissions)
 - #134583 (docs: `transmute<&mut T, &mut MaybeUninit<T>>` is unsound when exposed to safe code)
 - #134611 (Align `{i686,x86_64}-win7-windows-msvc` to their parent targets)
 - #134629 (compiletest: Allow using a specific debugger when running debuginfo tests)
 - #134642 (Implement `PointerLike` for `isize`, `NonNull`, `Cell`, `UnsafeCell`, and `SyncUnsafeCell`.)
 - #134660 (Fix spacing of markdown code block fences in compiler rustdoc)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2024-12-23 01:18:40 +00:00
commit 908af5ba4a
13 changed files with 125 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_hir_typeck/src/expr.rs
View file

@ -2720,12 +2720,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
/// Check field access expressions, this works for both structs and tuples.
/// Returns the Ty of the field.
///
/// ```not_rust
/// base.field
/// ^^^^^^^^^^ expr
/// ^^^^ base
/// ^^^^^ field
/// ```
/// ```ignore (illustrative)
/// base.field
/// ^^^^^^^^^^ expr
/// ^^^^ base
/// ^^^^^ field
/// ```
fn check_expr_field(
&self,
expr: &'tcx hir::Expr<'tcx>,

5
compiler/rustc_resolve/src/lib.rs
View file

@ -193,8 +193,10 @@ enum ImplTraitContext {
}
/// Used for tracking import use types which will be used for redundant import checking.
///
/// ### Used::Scope Example
/// ```rust,compile_fail
///
/// ```rust,compile_fail
/// #![deny(redundant_imports)]
/// use std::mem::drop;
/// fn main() {
@ -202,6 +204,7 @@ enum ImplTraitContext {
/// drop(s);
/// }
/// ```
///
/// Used::Other is for other situations like module-relative uses.
#[derive(Clone, Copy, PartialEq, PartialOrd, Debug)]
enum Used {

7
compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs
View file

@ -1,10 +1,11 @@
use crate::spec::{LinkerFlavor, Lld, Target, base};
use crate::spec::{LinkerFlavor, Lld, SanitizerSet, Target, base};
pub(crate) fn target() -> Target {
let mut base = base::windows_msvc::opts();
base.vendor = "win7".into();
base.cpu = "pentium4".into();
base.max_atomic_width = Some(64);
base.vendor = "win7".into();
base.supported_sanitizers = SanitizerSet::ADDRESS;
base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &[
// Mark all dynamic libraries and executables as compatible with the larger 4GiB address
@ -19,7 +20,7 @@ pub(crate) fn target() -> Target {
Target {
llvm_target: "i686-pc-windows-msvc".into(),
metadata: crate::spec::TargetMetadata {
description: Some("32-bit Windows 7 support".into()),
description: Some("32-bit MSVC (Windows 7+)".into()),
tier: Some(3),
host_tools: Some(false),
std: Some(true),

7
compiler/rustc_target/src/spec/targets/x86_64_win7_windows_msvc.rs
View file

@ -1,16 +1,17 @@
use crate::spec::{Target, base};
use crate::spec::{SanitizerSet, Target, base};
pub(crate) fn target() -> Target {
let mut base = base::windows_msvc::opts();
base.vendor = "win7".into();
base.cpu = "x86-64".into();
base.plt_by_default = false;
base.max_atomic_width = Some(64);
base.vendor = "win7".into();
base.supported_sanitizers = SanitizerSet::ADDRESS;
Target {
llvm_target: "x86_64-pc-windows-msvc".into(),
metadata: crate::spec::TargetMetadata {
description: Some("64-bit Windows 7 support".into()),
description: Some("64-bit MSVC (Windows 7+)".into()),
tier: Some(3),
host_tools: Some(false),
std: Some(true),