about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-01-23 09:38:41 -0500
committerSteve Klabnik <steve@steveklabnik.com>2016-01-23 09:38:41 -0500
commit068fa97c4e18e9bf36e0c5ba530538cf59b9de81 (patch)
tree5d663794d06dd8067b7b2ddfcfb7a9954c0db5a5 /src
parent03b4bf20f6fa922d7a1cfa5d270ce763ceca09bf (diff)
parent796f15878cc7c0ff2addc0091b091399a629a21d (diff)
downloadrust-068fa97c4e18e9bf36e0c5ba530538cf59b9de81.tar.gz
rust-068fa97c4e18e9bf36e0c5ba530538cf59b9de81.zip
Rollup merge of #31031 - brson:issue-30123, r=nikomatsakis
This was fixed in passing. Adding a regression test.
Diffstat (limited to 'src')
-rw-r--r--src/test/auxiliary/issue_30123_aux.rs33
-rw-r--r--src/test/compile-fail/issue-30123.rs19
2 files changed, 52 insertions, 0 deletions
diff --git a/src/test/auxiliary/issue_30123_aux.rs b/src/test/auxiliary/issue_30123_aux.rs
new file mode 100644
index 00000000000..f60311a9400
--- /dev/null
+++ b/src/test/auxiliary/issue_30123_aux.rs
@@ -0,0 +1,33 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::marker::PhantomData;
+
+pub struct Directed;
+pub struct Undirected;
+
+pub struct Graph<N, E, Ty = Directed> {
+    nodes: Vec<PhantomData<N>>,
+    edges: Vec<PhantomData<E>>,
+    ty: PhantomData<Ty>,
+}
+
+
+impl<N, E> Graph<N, E, Directed> {
+    pub fn new() -> Self {
+        Graph{nodes: Vec::new(), edges: Vec::new(), ty: PhantomData}
+    }
+}
+
+impl<N, E> Graph<N, E, Undirected> {
+    pub fn new_undirected() -> Self {
+        Graph{nodes: Vec::new(), edges: Vec::new(), ty: PhantomData}
+    }
+}
diff --git a/src/test/compile-fail/issue-30123.rs b/src/test/compile-fail/issue-30123.rs
new file mode 100644
index 00000000000..cfd3cd3af3e
--- /dev/null
+++ b/src/test/compile-fail/issue-30123.rs
@@ -0,0 +1,19 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// aux-build:issue_30123_aux.rs
+
+extern crate issue_30123_aux;
+use issue_30123_aux::*;
+
+fn main() {
+    let ug = Graph::<i32, i32>::new_undirected();
+    //~^ ERR no associated item named `new_undirected` found for type
+}