File tree Expand file tree Collapse file tree 6 files changed +10
-10
lines changed Expand file tree Collapse file tree 6 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ fn main() {
7
7
env_logger:: Builder :: from_env ( "NIX_SCRIPT_LOG" ) . init ( ) ;
8
8
9
9
let opts = Opts :: parse ( ) ;
10
- log:: trace!( "opts: {:?}" , opts ) ;
10
+ log:: trace!( "opts: {opts :?}" ) ;
11
11
12
12
match opts. run ( ) . map ( |status| status. code ( ) ) {
13
13
Ok ( Some ( code) ) => std:: process:: exit ( code) ,
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ impl Opts {
69
69
. map( |ps| ps. join( " " ) )
70
70
. unwrap_or_default( )
71
71
) ;
72
- log:: debug!( "build command is `{}`" , build_command ) ;
72
+ log:: debug!( "build command is `{build_command }`" ) ;
73
73
nix_script. arg ( "--build-command" ) . arg ( build_command) ;
74
74
75
75
let compiler = format ! (
Original file line number Diff line number Diff line change @@ -157,7 +157,7 @@ impl Builder {
157
157
. context ( "could not prepare derivation to build" ) ?;
158
158
159
159
log:: debug!( "writing derivation to {}" , build_path. display( ) ) ;
160
- log:: trace!( "derivation contents: {}" , derivation ) ;
160
+ log:: trace!( "derivation contents: {derivation}" ) ;
161
161
fs:: write ( build_path. join ( "default.nix" ) , derivation. to_string ( ) )
162
162
. context ( "could not write derivation contents" ) ?;
163
163
}
Original file line number Diff line number Diff line change @@ -74,7 +74,7 @@ impl Derivation {
74
74
pub fn add_build_inputs ( & mut self , build_inputs : Vec < Expr > ) {
75
75
for build_input in build_inputs {
76
76
if build_input. is_leaf ( ) {
77
- log:: trace!( "extracting build input `{}`" , build_input ) ;
77
+ log:: trace!( "extracting build input `{build_input }`" ) ;
78
78
self . inputs
79
79
. insert ( build_input. to_string ( ) , Some ( format ! ( "pkgs.{build_input}" ) ) ) ;
80
80
}
@@ -107,7 +107,7 @@ impl Derivation {
107
107
pub fn add_runtime_inputs ( & mut self , runtime_inputs : Vec < Expr > ) {
108
108
for runtime_input in runtime_inputs {
109
109
if runtime_input. is_leaf ( ) {
110
- log:: trace!( "extracting build input `{}`" , runtime_input ) ;
110
+ log:: trace!( "extracting build input `{runtime_input }`" ) ;
111
111
self . inputs . insert (
112
112
runtime_input. to_string ( ) ,
113
113
Some ( format ! ( "pkgs.{runtime_input}" ) ) ,
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ fn main() {
10
10
env_logger:: Builder :: from_env ( "NIX_SCRIPT_LOG" ) . init ( ) ;
11
11
12
12
let opts = Opts :: parse ( ) ;
13
- log:: trace!( "opts: {:?}" , opts ) ;
13
+ log:: trace!( "opts: {opts :?}" ) ;
14
14
15
15
match opts. run ( ) . map ( |status| status. code ( ) ) {
16
16
Ok ( Some ( code) ) => std:: process:: exit ( code) ,
Original file line number Diff line number Diff line change @@ -255,7 +255,7 @@ impl Opts {
255
255
// even when another builder has done the job for us in the
256
256
// meantime.
257
257
let lock_file_path = env:: temp_dir ( ) . join ( target_unique_id) ;
258
- log:: debug!( "creating lock file path: {:?}" , lock_file_path ) ;
258
+ log:: debug!( "creating lock file path: {lock_file_path :?}" ) ;
259
259
let lock_file =
260
260
File :: create ( lock_file_path. clone ( ) ) . context ( "could not create lock file" ) ?;
261
261
log:: debug!( "locking" ) ;
@@ -357,17 +357,17 @@ impl Opts {
357
357
}
358
358
359
359
for input in & directives. build_inputs {
360
- log:: trace!( "adding build input `{}` to packages" , input ) ;
360
+ log:: trace!( "adding build input `{input }` to packages" ) ;
361
361
command. arg ( "-p" ) . arg ( input. to_string ( ) ) ;
362
362
}
363
363
364
364
for input in & directives. runtime_inputs {
365
- log:: trace!( "adding runtime input `{}` to packages" , input ) ;
365
+ log:: trace!( "adding runtime input `{input }` to packages" ) ;
366
366
command. arg ( "-p" ) . arg ( input. to_string ( ) ) ;
367
367
}
368
368
369
369
if let Some ( run) = & self . run {
370
- log:: trace!( "running `{}`" , run ) ;
370
+ log:: trace!( "running `{run }`" ) ;
371
371
command. arg ( "--run" ) . arg ( run) ;
372
372
}
373
373
You can’t perform that action at this time.
0 commit comments