@@ -31,7 +31,7 @@ pub extern fn configure(_: &mut WindowManager, w: &WindowSystem, config: &mut Co
31
31
config. general . border_color = 0x404040 ;
32
32
config. general . focus_border_color = 0xebebeb ;
33
33
config. general . border_width = 1 ;
34
- config. general . terminal = ( String :: from_str ( "xterm" ) , String :: from_str ( "" ) ) ;
34
+ config. general . terminal = ( String :: from ( "xterm" ) , String :: from ( "" ) ) ;
35
35
config. general . layout = LayoutCollection :: new ( vec ! (
36
36
GapLayout :: new( 0 , AvoidStrutsLayout :: new( vec!( Direction :: Up , Direction :: Down ) , BinarySpacePartition :: new( ) ) ) ,
37
37
GapLayout :: new( 0 , AvoidStrutsLayout :: new( vec!( Direction :: Up , Direction :: Down ) , MirrorLayout :: new( BinarySpacePartition :: new( ) ) ) ) ,
@@ -40,7 +40,7 @@ pub extern fn configure(_: &mut WindowManager, w: &WindowSystem, config: &mut Co
40
40
config. general . tags = ( vec ! ( "一: ターミナル" , "二: ウェブ" , "三: コード" ,
41
41
"四: メディア" , "五: スチーム" , "六: ラテック" ,
42
42
"七: 音楽" , "八: im" , "九: 残り" ) )
43
- . into_iter ( ) . map ( String :: from_str ) . collect ( ) ;
43
+ . into_iter ( ) . map ( String :: from ) . collect ( ) ;
44
44
45
45
// Register key handlers
46
46
@@ -137,14 +137,14 @@ pub extern fn configure(_: &mut WindowManager, w: &WindowSystem, config: &mut Co
137
137
} else {
138
138
format ! ( "■" )
139
139
} )
140
- . fold ( String :: from_str ( "" ) , |a, x| {
140
+ . fold ( String :: from ( "" ) , |a, x| {
141
141
let mut r = a. clone ( ) ;
142
142
r. push_str ( & x) ;
143
143
r
144
144
} ) ;
145
145
146
146
let name = match m. workspaces . peek ( ) {
147
- None => String :: from_str ( "" ) ,
147
+ None => String :: from ( "" ) ,
148
148
Some ( window) => w. get_window_name ( window)
149
149
} ;
150
150
let content = format ! ( "{} {} {}\n " , workspaces, m. workspaces. current. workspace. layout. description( ) , name) ;
0 commit comments