File tree Expand file tree Collapse file tree 3 files changed +17
-4
lines changed Expand file tree Collapse file tree 3 files changed +17
-4
lines changed Original file line number Diff line number Diff line change @@ -7,9 +7,19 @@ use test_log::test;
7
7
8
8
// smoelius: The channel date is one day later than the `rustc --version` date.
9
9
// smoelius: Put recent boundaries first, since they're more likely to cause problems.
10
- const BOUNDARIES : [ ( & str , & str ) ; 3 ] = [
10
+ // smoelius: The relevant PRs and merge commits appear before each boundary.
11
+ const BOUNDARIES : [ ( & str , & str ) ; 4 ] = [
12
+ // https://github.com/rust-lang/rust/pull/111633
13
+ // https://github.com/rust-lang/rust/commit/08efb9d652c840715d15954592426e2befe13b36
14
+ ( "2023-05-18" , "2023-05-19" ) ,
15
+ // https://github.com/rust-lang/rust/pull/106810
16
+ // https://github.com/rust-lang/rust/commit/65d2f2a5f9c323c88d1068e8e90d0b47a20d491c
11
17
( "2023-01-19" , "2023-01-20" ) ,
18
+ // https://github.com/rust-lang/rust/pull/101501
19
+ // https://github.com/rust-lang/rust/commit/87788097b776f8e3662f76627944230684b671bd
12
20
( "2022-09-08" , "2022-09-09" ) ,
21
+ // https://github.com/rust-lang/rust/pull/98975
22
+ // https://github.com/rust-lang/rust/commit/0ed9c64c3e63acac9bd77abce62501696c390450
13
23
( "2022-07-14" , "2022-07-15" ) ,
14
24
] ;
15
25
Original file line number Diff line number Diff line change @@ -117,13 +117,16 @@ impl Callbacks {
117
117
let result = libloading:: Library :: new ( & path) ;
118
118
119
119
let lib = result. unwrap_or_else ( |err| {
120
+ // smoelius: rust-lang/rust#111633 changed the type of `early_error`'s `msg`
121
+ // argument from `&str` to `impl Into<DiagnosticMessage>`.
120
122
rustc_session:: early_error (
121
123
rustc_session:: config:: ErrorOutputType :: default ( ) ,
122
- & format ! (
124
+ format ! (
123
125
"could not load library `{}`: {}" ,
124
126
path. to_string_lossy( ) ,
125
127
err
126
- ) ,
128
+ )
129
+ . as_str ( ) ,
127
130
) ;
128
131
} ) ;
129
132
Original file line number Diff line number Diff line change @@ -457,7 +457,7 @@ pub fn init_config(sess: &rustc_session::Session) {
457
457
try_init_config ( sess) . unwrap_or_else ( |err| {
458
458
rustc_session:: early_error (
459
459
rustc_session:: config:: ErrorOutputType :: default ( ) ,
460
- & format ! ( "could not read configuration file: {err}" ) ,
460
+ format ! ( "could not read configuration file: {err}" ) . as_str ( ) ,
461
461
) ;
462
462
} ) ;
463
463
}
You can’t perform that action at this time.
0 commit comments