Skip to content

Commit 5c89655

Browse files
Rollup merge of #155351 - ujjwalvishwakarma2006:reorg-tests-01, r=Kivooeo
Reorganize tests from `tests/ui/issues/` The following tests are reorganized in this pull request | old-name | new-sub-dir | new-name | |-|-|-| | `auxiliary/issue-2316-a.rs` | `resolve/auxiliary` | `resolve-conflict-local-vs-glob-import-a.rs` | | `auxiliary/issue-2316-b.rs` | `resolve/auxiliary` | `resolve-conflict-local-vs-glob-import-b.rs` | | `issue-2316-c.rs` | `resolve/` | `resolve-conflict-local-vs-glob-import.rs` | | `issue-28839.rs` | `reborrow/` | `reborrow-mutable-reference.rs` | | `issue-32008.rs` | `overloaded/` | `subtyping-both-lhs-and-rhs-in-add-impl.rs` | | `issue-45425.rs` | `higher-ranked/` | `binop-lhs-hrtb-subtyping.rs` | r? Kivooeo
2 parents f0df37f + bcf86da commit 5c89655

9 files changed

Lines changed: 45 additions & 25 deletions

tests/ui/issues/issue-45425.rs renamed to tests/ui/higher-ranked/binop-lhs-hrtb-subtyping.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/45425>
12
//@ check-pass
23
#![allow(dead_code)]
34
use std::ops::Add;

tests/ui/issues/auxiliary/issue-2316-a.rs

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/ui/issues/auxiliary/issue-2316-b.rs

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/ui/issues/issue-2316-c.rs

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/ui/issues/issue-32008.rs renamed to tests/ui/overloaded/subtyping-both-lhs-and-rhs-in-add-impl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/32008>
12
//@ run-pass
23
#![allow(dead_code)]
34
#![allow(unused_variables)]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/28839>
2+
//@ run-pass
3+
4+
pub struct Foo;
5+
6+
pub fn get_foo2<'a>(foo: &'a mut Option<&'a mut Foo>) -> &'a mut Foo {
7+
match foo {
8+
// Ensure that this is not considered a move, but rather a reborrow.
9+
&mut Some(ref mut x) => *x,
10+
&mut None => panic!(),
11+
}
12+
}
13+
14+
fn main() {
15+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/2316>
2+
enum cat {
3+
tabby, calico, tortoiseshell
4+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/2316>
2+
#![allow(unused_imports)]
3+
4+
extern crate resolve_conflict_local_vs_glob_import_a;
5+
6+
pub mod cloth {
7+
use resolve_conflict_local_vs_glob_import_a::*;
8+
9+
pub enum fabric {
10+
gingham, flannel, calico
11+
}
12+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
//! Regression test for <https://github.com/rust-lang/rust/issues/2316>
2+
//@ run-pass
3+
//@ aux-build:resolve-conflict-local-vs-glob-import-a.rs
4+
//@ aux-build:resolve-conflict-local-vs-glob-import-b.rs
5+
6+
7+
extern crate resolve_conflict_local_vs_glob_import_b;
8+
use resolve_conflict_local_vs_glob_import_b::cloth;
9+
10+
pub fn main() {
11+
let _c: cloth::fabric = cloth::fabric::calico;
12+
}

0 commit comments

Comments
 (0)