Skip to content

Commit

Permalink
Fixup some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
alexcrichton committed May 11, 2018
1 parent 58481c0 commit 094873c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/libstd/sys/unix/fd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ impl FileDesc {
unsafe fn cvt_pread64(fd: c_int, buf: *mut c_void, count: usize, offset: i64)
-> io::Result<isize>
{
use convert::TryInto;
use libc::pread64;
// pread64 on emscripten actually takes a 32 bit offset
if let Ok(o) = offset.try_into() {
Expand Down Expand Up @@ -122,6 +123,7 @@ impl FileDesc {
unsafe fn cvt_pwrite64(fd: c_int, buf: *const c_void, count: usize, offset: i64)
-> io::Result<isize>
{
use convert::TryInto;
use libc::pwrite64;
// pwrite64 on emscripten actually takes a 32 bit offset
if let Ok(o) = offset.try_into() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/edition-lint-paths.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// except according to those terms.

#![feature(crate_in_paths)]
#![deny(absolute_path_starting_with_module)]
#![deny(absolute_path_not_starting_with_crate)]
#![allow(unused)]

pub mod foo {
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/edition-lint-paths.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ LL | use ::bar::Bar;
note: lint level defined here
--> $DIR/edition-lint-paths.rs:12:9
|
LL | #![deny(absolute_path_starting_with_module)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
LL | #![deny(absolute_path_not_starting_with_crate)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
= note: for more information, see issue TBD

Expand Down

0 comments on commit 094873c

Please sign in to comment.