File tree Expand file tree Collapse file tree 1 file changed +1
-6
lines changed Expand file tree Collapse file tree 1 file changed +1
-6
lines changed Original file line number Diff line number Diff line change @@ -60,9 +60,7 @@ impl Sysroot {
6060 let mut sysroot = Sysroot { crates : Arena :: default ( ) } ;
6161
6262 for name in SYSROOT_CRATES . trim ( ) . lines ( ) {
63- // FIXME: first path when 1.47 comes out
64- // https://github.com/rust-lang/rust/pull/73265
65- let root = [ format ! ( "lib{}/lib.rs" , name) , format ! ( "{}/src/lib.rs" , name) ]
63+ let root = [ format ! ( "{}/src/lib.rs" , name) , format ! ( "lib{}/lib.rs" , name) ]
6664 . iter ( )
6765 . map ( |it| sysroot_src_dir. join ( it) )
6866 . find ( |it| it. exists ( ) ) ;
@@ -149,9 +147,6 @@ try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
149147
150148fn get_rust_src ( sysroot_path : & AbsPath ) -> Option < AbsPathBuf > {
151149 // Try the new path first since the old one still exists.
152- //
153- // FIXME: remove `src` when 1.47 comes out
154- // https://github.com/rust-lang/rust/pull/73265
155150 let rust_src = sysroot_path. join ( "lib/rustlib/src/rust" ) ;
156151 log:: debug!( "Checking sysroot (looking for `library` and `src` dirs): {}" , rust_src. display( ) ) ;
157152 [ "library" , "src" ] . iter ( ) . map ( |it| rust_src. join ( it) ) . find ( |it| it. exists ( ) )
You can’t perform that action at this time.
0 commit comments