Skip to content

Commit df7db97

Browse files
committed
Rollup merge of #22009 - japaric:no-mov, r=alexcrichton
If you were still using `MaybeOwnedVector`, update your code to use `CowVec`. [breaking-change] --- We already removed `MaybeOwned` (the string equivalent) long time ago and with a much shorter deprecation period. It's time to let go.
2 parents fc1e045 + 67ee26d commit df7db97

File tree

3 files changed

+1
-170
lines changed

3 files changed

+1
-170
lines changed

src/libgraphviz/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@
278278
#![feature(collections)]
279279
#![feature(core)]
280280
#![feature(io)]
281-
#![feature(path)]
282281

283282
use self::LabelText::*;
284283

@@ -287,8 +286,6 @@ use std::old_io;
287286
use std::string::CowString;
288287
use std::vec::CowVec;
289288

290-
pub mod maybe_owned_vec;
291-
292289
/// The text for a graphviz label on a node or edge.
293290
pub enum LabelText<'a> {
294291
/// This kind of label preserves the text directly as is.

src/libgraphviz/maybe_owned_vec.rs

-165
This file was deleted.

src/test/run-make/save-analysis/foo.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ extern crate graphviz;
1717

1818
extern crate "flate" as myflate;
1919

20-
use graphviz::maybe_owned_vec::MaybeOwnedVector;
2120
use std::collections::{HashMap,HashSet};
2221
use std::cell::RefCell;
2322
use std::old_io::stdio::println;
@@ -35,7 +34,7 @@ use std::mem::size_of;
3534
static uni: &'static str = "Les Miséééééééérables";
3635
static yy: usize = 25us;
3736

38-
static bob: Option<graphviz::maybe_owned_vec::MaybeOwnedVector<'static, isize>> = None;
37+
static bob: Option<std::vec::CowVec<'static, isize>> = None;
3938

4039
// buglink test - see issue #1337.
4140

0 commit comments

Comments
 (0)