Skip to content
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.

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

Rollup of 10 pull requests #108421

Merged
merged 26 commits into from
Feb 24, 2023
Merged

Rollup of 10 pull requests #108421

merged 26 commits into from
Feb 24, 2023

Commits on Jan 15, 2023

  1. Configuration menu
    Copy the full SHA
    0d3eaa8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa2ff4d View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2023

  1. Configuration menu
    Copy the full SHA
    6bf2c4d View commit details
    Browse the repository at this point in the history
  2. add and bless tests

    fee1-dead committed Jan 31, 2023
    Configuration menu
    Copy the full SHA
    3aeb43c View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    eb1f9ba View commit details
    Browse the repository at this point in the history
  2. Make query keys Copy

    Zoxc committed Feb 21, 2023
    Configuration menu
    Copy the full SHA
    056c5b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. std: time: Avoid to use "was created" in elapsed() description

    ".. since this instant was created" is inaccurate and misleading,
    consider the following case:
    
    	let i1 = Instant::now(); // i1 is created at T1
    	let i2 = i1 + Duration::from_nanos(0); // i2 is "created" at T2
    	i2.elapsed(); // at T3
    
    Per the current description, `elapsed()` at T3 should return T3 - T2?
    
    Therefore removes the "was created" in the description of
    {Instant,SystemTime}::elapsed(). And since these types represent times,
    it's OK to use prepostions with them, e.g. "since this instant".
    fbq committed Feb 22, 2023
    Configuration menu
    Copy the full SHA
    b54a5fd View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2023

  1. Configuration menu
    Copy the full SHA
    6f92031 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    242daf8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    634d8cb View commit details
    Browse the repository at this point in the history
  4. Add stderr

    mejrs committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    4c13a21 View commit details
    Browse the repository at this point in the history
  5. parser: provide better errors on closures with braces missing

    We currently provide wrong suggestions and unhelpful errors on closure
    bodies with braces missing. For example, given the following code:
    
    ```
    fn main() {
        let _x = Box::new(|x|x+1;);
    }
    ```
    
    the current output is like this:
    
    ```
    error: expected expression, found `)`
     --> ./main.rs:2:30
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                              ^ expected expression
    
    error: closure bodies that contain statements must be surrounded by braces
     --> ./main.rs:2:25
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                         ^
    3 | }
      | ^
      |
    
    ...
    
    help: try adding braces
      |
    2 ~     let _x = Box::new(|x| {x+1;);
    3 ~ }}
    
    ...
    
    error: expected `;`, found `}`
     --> ./main.rs:2:32
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                                ^ help: add `;` here
    3 | }
      | - unexpected token
    
    error: aborting due to 3 previous errors
    ```
    
    This commit allows outputting correct suggestions and errors. The above
    code would output like this:
    
    ```
    error: closure bodies that contain statements must be surrounded by braces
     --> ./main.rs:2:25
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                         ^    ^
      |
    note: statement found outside of a block
     --> ./main.rs:2:29
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                          ---^ this `;` turns the preceding closure into a statement
      |                          |
      |                          this expression is a statement because of the trailing semicolon
    note: the closure body may be incorrectly delimited
     --> ./main.rs:2:23
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                       ^^^^^^ - ...but likely you meant the closure to end here
      |                       |
      |                       this is the parsed closure...
    help: try adding braces
      |
    2 |     let _x = Box::new(|x| {x+1;});
      |                           +    +
    
    error: aborting due to previous error
    ```
    ohno418 committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    0e42298 View commit details
    Browse the repository at this point in the history
  6. Fix is_terminal's handling of long paths on Windows.

    As reported in sunfishcode/is-terminal#18, there are situations where
    `GetFileInformationByHandleEx` can write a file name length that is
    longer than the provided buffer. To avoid deferencing memory past the
    end of the buffer, use a bounds-checked function to form a slice to
    the buffer and handle the out-of-bounds case.
    
    This ports the fix from sunfishcode/is-terminal#19 to std's `is_terminal`
    implementation.
    sunfishcode committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    c0c1925 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4332a27 View commit details
    Browse the repository at this point in the history
  8. diagnostics: remove inconsistent English article "this" from E0107

    Consider `tests/ui/const-generics/generic_const_exprs/issue-102768.stderr`,
    the error message where it gives additional notes about where the associated
    type is defined, and how the dead code lint doesn't have an article,
    like in `tests/ui/lint/dead-code/issue-85255.stderr`. They don't have
    articles, so it seems unnecessary to have one here.
    notriddle committed Feb 23, 2023
    Configuration menu
    Copy the full SHA
    a5b639d View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0241e49 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. Rollup merge of rust-lang#106541 - fee1-dead-contrib:no-const-check-n…

    …o, r=thomcc
    
    implement const iterator using `rustc_do_not_const_check`
    
    Previous experiment: rust-lang#102225.
    
    Explanation: rather than making all default methods work under `const` all at once, this uses `rustc_do_not_const_check` as a workaround to "trick" the compiler to not run any checks on those other default methods. Any const implementations are only required to implement the `next` method. Any actual calls to the trait methods other than `next` will either error in compile time (at CTFE runs), or run the methods correctly if they do not have any non-const operations. This is extremely easy to maintain, remove, or improve.
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    8c135ee View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#106918 - dtolnay:heapretain, r=the8472

    Rebuild BinaryHeap on unwind from retain
    
    This closes the hole identified in rust-lang#71503 (comment) which had made it possible for the caller to end up with a heap in invalid state. As of rust-lang#105851, heaps in invalid state are not supposed to exist.
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    b3657f9 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#106923 - mejrs:fluent_err, r=davidtwco

    Restore behavior when primary bundle is missing
    
    Fixes rust-lang#106755 by restoring some of the behavior prior to rust-lang#106427
    
    Still, I have no idea how this debug assertion can even hit while using `en-US` as primary  bundle.
    
    r? ```@davidtwco```
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    6826a96 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#108169 - Zoxc:query-key-copy, r=cjgillot

    Make query keys `Copy`
    
    This regressed compiler performance locally, so I'm curious what perf will say about it.
    
    <table><tr><td rowspan="2">Benchmark</td><td colspan="1"><b>Before</b></th><td colspan="2"><b>After</b></th></tr><tr><td align="right">Time</td><td align="right">Time</td><td align="right">%</th></tr><tr><td>🟣 <b>clap</b>:check</td><td align="right">1.7566s</td><td align="right">1.7657s</td><td align="right"> 0.52%</td></tr><tr><td>🟣 <b>hyper</b>:check</td><td align="right">0.2572s</td><td align="right">0.2578s</td><td align="right"> 0.20%</td></tr><tr><td>🟣 <b>regex</b>:check</td><td align="right">0.9863s</td><td align="right">0.9900s</td><td align="right"> 0.37%</td></tr><tr><td>🟣 <b>syn</b>:check</td><td align="right">1.6018s</td><td align="right">1.6073s</td><td align="right"> 0.34%</td></tr><tr><td>🟣 <b>syntex_syntax</b>:check</td><td align="right">6.2493s</td><td align="right">6.2920s</td><td align="right"> 0.68%</td></tr><tr><td>Total</td><td align="right">10.8512s</td><td align="right">10.9127s</td><td align="right"> 0.57%</td></tr><tr><td>Summary</td><td align="right">1.0000s</td><td align="right">1.0042s</td><td align="right"> 0.42%</td></tr></table>
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    440113d View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#108287 - compiler-errors:new-solver-bad-cas…

    …t, r=spastorino
    
    Add test for bad cast with deferred projection equality
    
    1. Unification during coercion (`Coerce::unify`) needs to consider deferred projection obligations (at least pass over them with `predicate_may_hold` or something, to disqualify any totally wrong unifications) -- otherwise, we'll shallowly consider `<u8 as Add>::Output` and `char` as coercible during `FnCtxt::try_coerce`, which will fail later when the nested obligations are registered and processed.
    
    2. Cast checking needs to be able to structurally normalize types so it sees `u8` instead of `<u8 as Add>::Output`. Otherwise it'll always consider the latter as part of a non-primitive cast. Currently `FnCtxt::normalize` doesn't do anything useful here, interestingly.
    
    I tried looking into both of these and it's not immediately clear where to refactor existing typeck code to fix this (at least the latter), but I'm gonna commit a test for it at least so we don't forget. This is one of the issues that's keeping us from building larger projects.
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    251293e View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#108370 - fbq:time-doc-fix, r=thomcc

    std: time: Avoid to use "was created" in elapsed() description
    
    ".. since this instant was created" is inaccurate and misleading, consider the following case:
    ```rust
    	let i1 = Instant::now(); // i1 is created at T1
    	let i2 = i1 + Duration::from_nanos(0); // i2 is "created" at T2
    	i2.elapsed(); // at T3
    ```
    Per the current description, `elapsed()` at T3 should return T3 - T2?
    
    To avoid the inaccuracy, removes the "was created" in the description of {Instant,SystemTime}::elapsed().
    And since these types represent times, it's OK to use prepostions with them, e.g. "since this instant".
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    f94c3c9 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#108377 - clubby789:duplicate-diagnostic-ice…

    …, r=compiler-errors
    
    Fix ICE in 'duplicate diagnostic item' diagnostic
    
    Not sure how to add this in a test; I found it by mistakenly running `cargo fix --lib -p std` rather than `x fix` at the root.
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    4aff2c5 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#108388 - ohno418:better-suggestion-on-malfo…

    …rmed-closure, r=davidtwco
    
    parser: provide better suggestions and errors on closures with braces missing
    
    We currently provide wrong suggestions and unhelpful errors on closure bodies with braces missing.
    
    For example, given the following code:
    
    ```rust
    fn main() {
        let _x = Box::new(|x|x+1;);
    }
    ```
    
    the current output is:
    
    ```
    error: expected expression, found `)`
     --> ./main.rs:2:30
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                              ^ expected expression
    
    error: closure bodies that contain statements must be surrounded by braces
     --> ./main.rs:2:25
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                         ^
    3 | }
      | ^
      |
    note: statement found outside of a block
     --> ./main.rs:2:29
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                          ---^ this `;` turns the preceding closure into a statement
      |                          |
      |                          this expression is a statement because of the trailing semicolon
    note: the closure body may be incorrectly delimited
     --> ./main.rs:2:23
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                       ^^^^^^ this is the parsed closure...
    3 | }
      | - ...but likely you meant the closure to end here
    help: try adding braces
      |
    2 ~     let _x = Box::new(|x| {x+1;);
    3 ~ }}
      |
    
    error: expected `;`, found `}`
     --> ./main.rs:2:32
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                                ^ help: add `;` here
    3 | }
      | - unexpected token
    
    error: aborting due to 3 previous errors
    ```
    
    We got 3 errors, but all but the second are unnecessary or just wrong.
    
    This commit allows outputting correct suggestions and errors. The above code would output like this:
    
    ```
    error: closure bodies that contain statements must be surrounded by braces
     --> ./main.rs:2:25
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                         ^    ^
      |
    note: statement found outside of a block
     --> ./main.rs:2:29
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                          ---^ this `;` turns the preceding closure into a statement
      |                          |
      |                          this expression is a statement because of the trailing semicolon
    note: the closure body may be incorrectly delimited
     --> ./main.rs:2:23
      |
    2 |     let _x = Box::new(|x|x+1;);
      |                       ^^^^^^ - ...but likely you meant the closure to end here
      |                       |
      |                       this is the parsed closure...
    help: try adding braces
      |
    2 |     let _x = Box::new(|x| {x+1;});
      |                           +    +
    
    error: aborting due to previous error
    ```
    
    Fixes rust-lang#107959.
    
    r? diagnostics
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    8acbfe2 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#108391 - sunfishcode:sunfishcode/is-termina…

    …l-file-length, r=ChrisDenton
    
    Fix `is_terminal`'s handling of long paths on Windows.
    
    As reported in sunfishcode/is-terminal#18, there are situations where `GetFileInformationByHandleEx` can write a file name length that is longer than the provided buffer. To avoid deferencing memory past the end of the buffer, use a bounds-checked function to form a slice to the buffer and handle the out-of-bounds case.
    
    This ports the fix from sunfishcode/is-terminal#19 to std's `is_terminal` implementation.
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    353827a View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#108401 - notriddle:notriddle/diagnostics-ar…

    …ticle, r=compiler-errors
    
    diagnostics: remove inconsistent English article "this" from E0107
    
    Consider [`tests/ui/const-generics/generic_const_exprs/issue-102768.stderr`][issue-102768.stderr], the error message where it gives additional notes about where the associated type is defined, and how the dead code lint doesn't have an article, like in [`tests/ui/lint/dead-code/issue-85255.stderr`][issue-85255.stderr]. They don't have articles, so it seems unnecessary to have one here.
    
    [issue-102768.stderr]: https://github.com/rust-lang/rust/blob/07c993eba8b76eae497e98433ae075b00f01be10/tests/ui/const-generics/generic_const_exprs/issue-102768.stderr
    [issue-85255.stderr]: https://github.com/rust-lang/rust/blob/07c993eba8b76eae497e98433ae075b00f01be10/tests/ui/lint/dead-code/issue-85255.stderr
    Dylan-DPC committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    c77cf40 View commit details
    Browse the repository at this point in the history