Skip to content

Commit 094873c

Browse files
committed
Fixup some tests
1 parent 58481c0 commit 094873c

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

src/libstd/sys/unix/fd.rs

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ impl FileDesc {
7575
unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: usize, offset: i64)
7676
-> io::Result<isize>
7777
{
78+
use convert::TryInto;
7879
use libc::pread64;
7980
// pread64 on emscripten actually takes a 32 bit offset
8081
if let Ok(o) = offset.try_into() {
@@ -122,6 +123,7 @@ impl FileDesc {
122123
unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: usize, offset: i64)
123124
-> io::Result<isize>
124125
{
126+
use convert::TryInto;
125127
use libc::pwrite64;
126128
// pwrite64 on emscripten actually takes a 32 bit offset
127129
if let Ok(o) = offset.try_into() {

src/test/ui/edition-lint-paths.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![feature(crate_in_paths)]
12-
#![deny(absolute_path_starting_with_module)]
12+
#![deny(absolute_path_not_starting_with_crate)]
1313
#![allow(unused)]
1414

1515
pub mod foo {

src/test/ui/edition-lint-paths.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ LL | use ::bar::Bar;
77
note: lint level defined here
88
--> $DIR/edition-lint-paths.rs:12:9
99
|
10-
LL | #![deny(absolute_path_starting_with_module)]
11-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
10+
LL | #![deny(absolute_path_not_starting_with_crate)]
11+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1212
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
1313
= note: for more information, see issue TBD
1414

0 commit comments

Comments
 (0)