Skip to content

Commit e86a32d

Browse files
committed
MAINT: Port to Rust 2018 edition
1 parent f952e2c commit e86a32d

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name = "arrayvec"
33
version = "0.4.11"
44
authors = ["bluss"]
55
license = "MIT/Apache-2.0"
6+
edition = "2018"
67

78
description = "A vector with fixed capacity, backed by an array (it can be stored on the stack too). Implements fixed capacity ArrayVec and ArrayString."
89
documentation = "https://docs.rs/arrayvec/"

src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pub unsafe trait Array {
2626

2727
pub trait Index : PartialEq + Copy {
2828
fn to_usize(self) -> usize;
29-
fn from(usize) -> Self;
29+
fn from(_: usize) -> Self;
3030
}
3131

3232
impl Index for () {

src/array_string.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ use std::str::FromStr;
99
use std::str::Utf8Error;
1010
use std::slice;
1111

12-
use array::Array;
13-
use array::Index;
14-
use CapacityError;
15-
use char::encode_utf8;
12+
use crate::array::Array;
13+
use crate::array::Index;
14+
use crate::CapacityError;
15+
use crate::char::encode_utf8;
1616

1717
#[cfg(feature="serde-1")]
1818
use serde::{Serialize, Deserialize, Serializer, Deserializer};

src/lib.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use std::io;
4848

4949

5050
mod maybe_uninit;
51-
use maybe_uninit::MaybeUninit;
51+
use crate::maybe_uninit::MaybeUninit;
5252

5353
#[cfg(feature="serde-1")]
5454
use serde::{Serialize, Deserialize, Serializer, Deserializer};
@@ -59,11 +59,11 @@ mod char;
5959
mod range;
6060
mod errors;
6161

62-
pub use array::Array;
63-
pub use range::RangeArgument;
64-
use array::Index;
65-
pub use array_string::ArrayString;
66-
pub use errors::CapacityError;
62+
pub use crate::array::Array;
63+
pub use crate::range::RangeArgument;
64+
use crate::array::Index;
65+
pub use crate::array_string::ArrayString;
66+
pub use crate::errors::CapacityError;
6767

6868

6969
/// A vector with a fixed capacity.

src/maybe_uninit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22

3-
use array::Array;
3+
use crate::array::Array;
44
use std::mem::MaybeUninit as StdMaybeUninit;
55

66
#[derive(Copy)]

tests/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ fn test_extend() {
258258
#[test]
259259
fn test_is_send_sync() {
260260
let data = ArrayVec::<[Vec<i32>; 5]>::new();
261-
&data as &Send;
262-
&data as &Sync;
261+
&data as &dyn Send;
262+
&data as &dyn Sync;
263263
}
264264

265265
#[test]
@@ -470,7 +470,7 @@ fn test_string() {
470470
assert_eq!(tmut, "ab");
471471

472472
// Test Error trait / try
473-
let t = || -> Result<(), Box<Error>> {
473+
let t = || -> Result<(), Box<dyn Error>> {
474474
let mut t = ArrayString::<[_; 2]>::new();
475475
t.try_push_str(text)?;
476476
Ok(())

0 commit comments

Comments
 (0)