subtree-push nightly-2024-12-02

[ytmimi]

Bumping the toolchain version as part of a git subtree push

current toolchain (nightly-2024-09-10):

• 1.83.0-nightly (c2f74c3f9 2024-09-09)

latest toolchain (nightly-2024-12-02):

• 1.85.0-nightly (5e1440ae5 2024-12-01)

r? @calebcartwright

Here's the link to the Diff Check Job

Edit: Job Failed, but those failures were expected. See details about the failures below.

[ytmimi]

There were formatting difference in the diff-check related to nightly formatting implemented in the compiler.

• #![feature(pin_ergonomics)] 44788b8
• #![feature(generic_const_items)] d03d338:
• #![feature(unsafe_fields)] b116480

---

#![feature(pin_ergonomics)] 44788b8

Details

Input

#![feature(pin_ergonomics)]
#![allow(incomplete_features)]

fn f(x: &pin  const i32) {}
fn g<'a>(x: &  'a pin const  i32) {}
fn h<'a>(x: &  'a pin  
mut i32) {}
fn i(x: &pin      mut  i32) {}

Output (master rustfmt)

Parse Errors

error: expected identifier, found keyword `const`
 --> <stdin>:4:15
  |
4 | fn f(x: &pin  const i32) {}
  |               ^^^^^ expected identifier, found keyword

error: expected one of `:` or `|`, found `i32`
 --> <stdin>:4:21
  |
4 | fn f(x: &pin  const i32) {}
  |                     ^^^
  |                     |
  |                     expected one of `:` or `|`
  |                     help: declare the type after the parameter binding: `<identifier>: <type>`

error: expected one of `!`, `(`, `)`, `,`, `::`, or `<`, found keyword `const`
 --> <stdin>:4:15
  |
4 | fn f(x: &pin  const i32) {}
  |               ^^^^^ expected one of `!`, `(`, `)`, `,`, `::`, or `<`
  |
help: there is a keyword `in` with a similar name
  |
4 | fn f(x: &in  const i32) {}
  |          ~~
help: missing `,`
  |
4 | fn f(x: &pin,  const i32) {}
  |             +

error: expected identifier, found keyword `const`
 --> <stdin>:5:23
  |
5 | fn g<'a>(x: &  'a pin const  i32) {}
  |                       ^^^^^ expected identifier, found keyword

error: expected one of `:` or `|`, found `i32`
 --> <stdin>:5:30
  |
5 | fn g<'a>(x: &  'a pin const  i32) {}
  |                              ^^^
  |                              |
  |                              expected one of `:` or `|`
  |                              help: declare the type after the parameter binding: `<identifier>: <type>`

error: expected one of `!`, `(`, `)`, `,`, `::`, or `<`, found keyword `const`
 --> <stdin>:5:23
  |
5 | fn g<'a>(x: &  'a pin const  i32) {}
  |                       ^^^^^ expected one of `!`, `(`, `)`, `,`, `::`, or `<`
  |
help: there is a keyword `in` with a similar name
  |
5 | fn g<'a>(x: &  'a in const  i32) {}
  |                   ~~
help: missing `,`
  |
5 | fn g<'a>(x: &  'a pin, const  i32) {}
  |                      +

error: expected one of `:`, `@`, or `|`, found `)`
 --> <stdin>:7:8
  |
7 | mut i32) {}
  |        ^ expected one of `:`, `@`, or `|`
  |
  = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this is a parameter name, give it a type
  |
7 | mut i32: TypeName) {}
  |        ++++++++++
help: if this is a type, explicitly ignore the parameter name
  |
7 | _: mut i32) {}
  | ++

error: expected one of `!`, `(`, `)`, `,`, `::`, or `<`, found keyword `mut`
 --> <stdin>:7:1
  |
6 | fn h<'a>(x: &  'a pin  
  |                      - expected one of `!`, `(`, `)`, `,`, `::`, or `<`
7 | mut i32) {}
  | ^^^ unexpected token
  |
help: there is a keyword `in` with a similar name
  |
6 | fn h<'a>(x: &  'a in  
  |                   ~~
help: missing `,`
  |
6 | fn h<'a>(x: &  'a pin,  
  |                      +

error: expected one of `:`, `@`, or `|`, found `)`
 --> <stdin>:8:27
  |
8 | fn i(x: &pin      mut  i32) {}
  |                           ^ expected one of `:`, `@`, or `|`
  |
  = note: anonymous parameters are removed in the 2018 edition (see RFC 1685)
help: if this is a parameter name, give it a type
  |
8 | fn i(x: &pin      mut  i32: TypeName) {}
  |                           ++++++++++
help: if this is a type, explicitly ignore the parameter name
  |
8 | fn i(x: &pin      _: mut  i32) {}
  |                   ++

error: expected one of `!`, `(`, `)`, `,`, `::`, or `<`, found keyword `mut`
 --> <stdin>:8:19
  |
8 | fn i(x: &pin      mut  i32) {}
  |                   ^^^ expected one of `!`, `(`, `)`, `,`, `::`, or `<`
  |
help: there is a keyword `in` with a similar name
  |
8 | fn i(x: &in      mut  i32) {}
  |          ~~
help: missing `,`
  |
8 | fn i(x: &pin,      mut  i32) {}
  |             +

Output (subtree-push-nightly-2024-12-02 rustfmt)
Pin sugar formatted as expected

#![feature(pin_ergonomics)]
#![allow(incomplete_features)]

fn f(x: &pin const i32) {}
fn g<'a>(x: &'a pin const i32) {}
fn h<'a>(x: &'a pin mut i32) {}
fn i(x: &pin mut i32) {}

---

#![feature(generic_const_items)] Changes d03d338

Details

Input

#![feature(generic_const_items)]

const GENERIC<N, const M: usize>: i32 = 0;

const WHERECLAUSE: i32 = 0
where
    i32:;

trait Foo {
    const GENERIC<N, const M: usize>: i32;

    const WHERECLAUSE: i32
    where
        i32:;
}

impl Foo for () {
    const GENERIC<N, const M: usize>: i32 = 0;

    const WHERECLAUSE: i32 = 0
    where
        i32:;
}

Output (master rustfmt)
Drops the generics.

#![feature(generic_const_items)]

const GENERIC: i32 = 0;

const WHERECLAUSE: i32 = 0;

trait Foo {
    const GENERIC: i32;

    const WHERECLAUSE: i32;
}

impl Foo for () {
    const GENERIC: i32 = 0;

    const WHERECLAUSE: i32 = 0;
}

Output (subtree-push-nightly-2024-12-02 rustfmt)
Output left unchanged.

#![feature(generic_const_items)]

const GENERIC<N, const M: usize>: i32 = 0;

const WHERECLAUSE: i32 = 0
where
    i32:;

trait Foo {
    const GENERIC<N, const M: usize>: i32;

    const WHERECLAUSE: i32
    where
        i32:;
}

impl Foo for () {
    const GENERIC<N, const M: usize>: i32 = 0;

    const WHERECLAUSE: i32 = 0
    where
        i32:;
}

---

#![feature(unsafe_fields)] Changes b116480

Details

Input

struct Foo {
    unsafe
    field: (),
}

enum Bar {
    Variant {
        unsafe
        field: (),
    },
}

union Baz {
    unsafe
    field: (),
}

Output (master rustfmt)

Parse Errors

error: expected identifier, found keyword `unsafe`
 --> <stdin>:2:5
  |
1 | struct Foo {
  |        --- while parsing this struct
2 |     unsafe
  |     ^^^^^^ expected identifier, found keyword

error: expected identifier, found keyword `unsafe`
 --> <stdin>:8:9
  |
7 |     Variant {
  |     ------- while parsing this struct
8 |         unsafe
  |         ^^^^^^ expected identifier, found keyword

error: expected identifier, found keyword `unsafe`
  --> <stdin>:14:5
   |
13 | union Baz {
   |       --- while parsing this union
14 |     unsafe
   |     ^^^^^^ expected identifier, found keyword

Output (subtree-push-nightly-2024-12-02 rustfmt)
Formats structs using unsafe fields as expected.

struct Foo {
    unsafe field: (),
}

enum Bar {
    Variant { unsafe field: () },
}

union Baz {
    unsafe field: (),
}