forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#100540 - matthiaskrgr:rollup-734hkpt, r=matth…
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#100249 (Fix HorizonOS regression in FileTimes) - rust-lang#100253 (Recover from mutable variable declaration where `mut` is placed before `let`) - rust-lang#100482 (Add Duration rounding change to release note) - rust-lang#100523 ([rustdoc] remove Clean trait) - rust-lang#100524 (Impl `Debug` for some structs of rustbuild) - rust-lang#100526 (Add tests for the drop behavior of some control flow constructs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
- Loading branch information
Showing
10 changed files
with
196 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| // run-pass | ||
|
|
||
| use std::cell::RefCell; | ||
| use std::convert::TryInto; | ||
|
|
||
| #[derive(Default)] | ||
| struct DropOrderCollector(RefCell<Vec<u32>>); | ||
|
|
||
| struct LoudDrop<'a>(&'a DropOrderCollector, u32); | ||
|
|
||
| impl Drop for LoudDrop<'_> { | ||
| fn drop(&mut self) { | ||
| println!("{}", self.1); | ||
| self.0.0.borrow_mut().push(self.1); | ||
| } | ||
| } | ||
|
|
||
| impl DropOrderCollector { | ||
| fn option_loud_drop(&self, n: u32) -> Option<LoudDrop> { | ||
| Some(LoudDrop(self, n)) | ||
| } | ||
|
|
||
| fn loud_drop(&self, n: u32) -> LoudDrop { | ||
| LoudDrop(self, n) | ||
| } | ||
|
|
||
| fn print(&self, n: u32) { | ||
| println!("{}", n); | ||
| self.0.borrow_mut().push(n) | ||
| } | ||
|
|
||
| fn if_(&self) { | ||
| if self.option_loud_drop(1).is_some() { | ||
| self.print(2); | ||
| } | ||
|
|
||
| if self.option_loud_drop(3).is_none() { | ||
| unreachable!(); | ||
| } else if self.option_loud_drop(4).is_some() { | ||
| self.print(5); | ||
| } | ||
|
|
||
| if { | ||
| if self.option_loud_drop(7).is_some() && self.option_loud_drop(6).is_some() { | ||
| self.loud_drop(8); | ||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } { | ||
| self.print(9); | ||
| } | ||
| } | ||
|
|
||
| fn if_let(&self) { | ||
| if let None = self.option_loud_drop(2) { | ||
| unreachable!(); | ||
| } else { | ||
| self.print(1); | ||
| } | ||
|
|
||
| if let Some(_) = self.option_loud_drop(4) { | ||
| self.print(3); | ||
| } | ||
|
|
||
| if let Some(_d) = self.option_loud_drop(6) { | ||
| self.print(5); | ||
| } | ||
| } | ||
|
|
||
| fn match_(&self) { | ||
| match self.option_loud_drop(2) { | ||
| _any => self.print(1), | ||
| } | ||
|
|
||
| match self.option_loud_drop(4) { | ||
| _ => self.print(3), | ||
| } | ||
|
|
||
| match self.option_loud_drop(6) { | ||
| Some(_) => self.print(5), | ||
| _ => unreachable!(), | ||
| } | ||
|
|
||
| match { | ||
| let _ = self.loud_drop(7); | ||
| let _d = self.loud_drop(9); | ||
| self.print(8); | ||
| () | ||
| } { | ||
| () => self.print(10), | ||
| } | ||
|
|
||
| match { | ||
| match self.option_loud_drop(14) { | ||
| _ => { | ||
| self.print(11); | ||
| self.option_loud_drop(13) | ||
| } | ||
| } | ||
| } { | ||
| _ => self.print(12), | ||
| } | ||
|
|
||
| match { | ||
| loop { | ||
| break match self.option_loud_drop(16) { | ||
| _ => { | ||
| self.print(15); | ||
| self.option_loud_drop(18) | ||
| } | ||
| }; | ||
| } | ||
| } { | ||
| _ => self.print(17), | ||
| } | ||
| } | ||
|
|
||
| fn assert_sorted(self) { | ||
| assert!( | ||
| self.0 | ||
| .into_inner() | ||
| .into_iter() | ||
| .enumerate() | ||
| .all(|(idx, item)| idx + 1 == item.try_into().unwrap()) | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| println!("-- if --"); | ||
| let collector = DropOrderCollector::default(); | ||
| collector.if_(); | ||
| collector.assert_sorted(); | ||
|
|
||
| println!("-- if let --"); | ||
| let collector = DropOrderCollector::default(); | ||
| collector.if_let(); | ||
| collector.assert_sorted(); | ||
|
|
||
| println!("-- match --"); | ||
| let collector = DropOrderCollector::default(); | ||
| collector.match_(); | ||
| collector.assert_sorted(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // run-rustfix | ||
|
|
||
| fn main() { | ||
| let mut _x = 123; | ||
| //~^ ERROR invalid variable declaration | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| // run-rustfix | ||
|
|
||
| fn main() { | ||
| mut let _x = 123; | ||
| //~^ ERROR invalid variable declaration | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| error: invalid variable declaration | ||
| --> $DIR/issue-100197-mut-let.rs:4:5 | ||
| | | ||
| LL | mut let _x = 123; | ||
| | ^^^^^^^ help: switch the order of `mut` and `let`: `let mut` | ||
|
|
||
| error: aborting due to previous error | ||
|
|