Commit 6df4070

committed

stabilize offset_of_slice

1 parent 81d8c74 commit 6df4070Copy full SHA for 6df4070

File tree

-53

lines changed

-53

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,8 @@ declare_features! (`
`318`	`318`	`(accepted, non_modrs_mods, "1.30.0", Some(44660)),`
`319`	`319`	`/// Allows using multiple nested field accesses in offset_of!`
`320`	`320`	`(accepted, offset_of_nested, "1.82.0", Some(120140)),`
	`321`	`+ /// Allows using fields with slice type in offset_of!`
	`322`	`+ (accepted, offset_of_slice, "CURRENT_RUSTC_VERSION", Some(126151)),`
`321`	`323`	/// Allows the use of or-patterns (e.g., `0 \| 1`).
`322`	`324`	`(accepted, or_patterns, "1.53.0", Some(54883)),`
`323`	`325`	/// Allows using `+bundle,+whole-archive` link modifiers with native libs.

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -589,8 +589,6 @@ declare_features! (`
`589`	`589`	`(incomplete, non_lifetime_binders, "1.69.0", Some(108185)),`
`590`	`590`	`/// Allows using enums in offset_of!`
`591`	`591`	`(unstable, offset_of_enum, "1.75.0", Some(120141)),`
`592`		`- /// Allows using fields with slice type in offset_of!`
`593`		`- (unstable, offset_of_slice, "1.81.0", Some(126151)),`
`594`	`592`	/// Allows using `#[optimize(X)]`.
`595`	`593`	`(unstable, optimize_attribute, "1.34.0", Some(54882)),`
`596`	`594`	`/// Allows specifying nop padding on functions for dynamic patching.`

Lines changed: 2 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -3946,15 +3946,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`3946`	`3946`	`{`
`3947`	`3947`	`let field_ty = self.field_ty(expr.span, field, args);`
`3948`	`3948`
`3949`		`- if self.tcx.features().offset_of_slice() {`
`3950`		`- self.require_type_has_static_alignment(field_ty, expr.span);`
`3951`		`- } else {`
`3952`		`- self.require_type_is_sized(`
`3953`		`- field_ty,`
`3954`		`- expr.span,`
`3955`		`- ObligationCauseCode::Misc,`
`3956`		`- );`
`3957`		`- }`
	`3949`	`+ self.require_type_has_static_alignment(field_ty, expr.span);`
`3958`	`3950`
`3959`	`3951`	`if field.vis.is_accessible_from(def_scope, self.tcx) {`
`3960`	`3952`	`self.tcx.check_stability(field.did, Some(expr.hir_id), expr.span, None);`
`@@ -3975,15 +3967,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`3975`	`3967`	`&& field.name == sym::integer(index)`
`3976`	`3968`	`{`
`3977`	`3969`	`if let Some(&field_ty) = tys.get(index) {`
`3978`		`- if self.tcx.features().offset_of_slice() {`
`3979`		`- self.require_type_has_static_alignment(field_ty, expr.span);`
`3980`		`- } else {`
`3981`		`- self.require_type_is_sized(`
`3982`		`- field_ty,`
`3983`		`- expr.span,`
`3984`		`- ObligationCauseCode::Misc,`
`3985`		`- );`
`3986`		`- }`
	`3970`	`+ self.require_type_has_static_alignment(field_ty, expr.span);`
`3987`	`3971`
`3988`	`3972`	`field_indices.push((FIRST_VARIANT, index.into()));`
`3989`	`3973`	`current_container = field_ty;`

Lines changed: 0 additions & 30 deletions

This file was deleted.

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,6 @@`
`3`	`3`	`//@[next] compile-flags: -Znext-solver`
`4`	`4`	`//@ run-pass`
`5`	`5`
`6`		`-#![feature(offset_of_slice)]`
`7`		`-`
`8`	`6`	`use std::mem::offset_of;`
`9`	`7`
`10`	`8`	`trait Mirror {`

Lines changed: 0 additions & 1 deletion

Comments

(0)