Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use full path to vec! in smallvec! macro #198

Merged
merged 1 commit into from Jan 28, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib.rs
Expand Up @@ -31,14 +31,14 @@
#![cfg_attr(feature = "may_dangle", feature(dropck_eyepatch))]
#![deny(missing_docs)]

#[macro_use]
extern crate alloc;
#[doc(hidden)]
pub extern crate alloc;

#[cfg(any(test, feature = "write"))]
extern crate std;

use alloc::boxed::Box;
use alloc::vec::Vec;
use alloc::{vec, vec::Vec};
use core::borrow::{Borrow, BorrowMut};
use core::cmp;
use core::fmt;
Expand Down Expand Up @@ -116,7 +116,7 @@ macro_rules! smallvec {
$(vec.push($x);)*
vec
} else {
$crate::SmallVec::from_vec(vec![$($x,)*])
$crate::SmallVec::from_vec($crate::alloc::vec![$($x,)*])
}
});
}
Expand Down Expand Up @@ -1684,7 +1684,7 @@ mod tests {
use alloc::borrow::ToOwned;
use alloc::boxed::Box;
use alloc::rc::Rc;
use alloc::vec::Vec;
use alloc::{vec, vec::Vec};

#[test]
pub fn test_zero() {
Expand Down