Skip to content

Commit 840529f

Browse files
committedDec 17, 2023
change package name for crates.io
1 parent 5d23d0a commit 840529f

File tree

12 files changed

+23
-18
lines changed

12 files changed

+23
-18
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/target/
33
Cargo.lock
44
firedbg
5+
.vscode

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[workspace]
22
members = [
3-
"macros",
4-
"or",
3+
"or-rs-macros",
4+
"or-rs",
55
"tests",
66
"code_gen"
77
]

‎macros/Cargo.toml ‎or-rs-macros/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "macros"
2+
name = "or-rs-macros"
33
version = "0.1.0"
44
edition = "2021"
55

@@ -12,7 +12,7 @@ proc-macro2 = { version = "1", features = ["span-locations"]}
1212
syn = { version = "2.0.39", features = ["full", "visit", "extra-traits"] }
1313

1414
[dev-dependencies]
15-
or = { path = "../or" }
15+
or-rs = { path = "../or-rs" }
1616

1717
[lib]
1818
proc-macro = true
File renamed without changes.

‎macros/src/lib.rs ‎or-rs-macros/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use proc_macro::TokenStream;
2222
/// ```rust
2323
/// #![feature(proc_macro_hygiene)]
2424
///
25-
/// use macros::or_gen;
26-
/// use or::enums::Or3;
25+
/// use or_rs_macros::or_gen;
26+
/// use or_rs::enums::Or3;
2727
///
2828
/// #[or_gen]
2929
/// // add a type annotation explicitly
@@ -41,8 +41,8 @@ use proc_macro::TokenStream;
4141
/// ```rust
4242
/// #![feature(proc_macro_hygiene)]
4343
///
44-
/// use macros::or_gen;
45-
/// use or::enums::Or3;
44+
/// use or_rs_macros::or_gen;
45+
/// use or_rs::enums::Or3;
4646
///
4747
/// #[or_gen]
4848
/// // add a type annotation explicitly

‎macros/src/parser.rs ‎or-rs-macros/src/parser.rs

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pub(crate) struct MacroParser {
1616
}
1717

1818
impl MacroParser {
19+
#[allow(dead_code, unused_variables)]
1920
pub(crate) fn new(input_token_stream: TokenStream) -> Self {
2021
let return_type = Self::get_return_type_from_input_token(input_token_stream.clone());
2122

@@ -25,6 +26,7 @@ impl MacroParser {
2526
}
2627
}
2728

29+
#[allow(dead_code, unused_variables)]
2830
fn get_return_type_from_input_token(input_token_stream: TokenStream) -> Type {
2931
todo!()
3032
}

‎or/Cargo.toml ‎or-rs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "or"
2+
name = "or-rs"
33
version = "0.1.0"
44
edition = "2021"
55

‎or/src/enums.rs ‎or-rs/src/enums.rs

File renamed without changes.

‎or/src/lib.rs ‎or-rs/src/lib.rs

File renamed without changes.

‎tests/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ edition = "2021"
88
[dependencies]
99

1010
[dev-dependencies]
11-
macros = { path = "../macros" }
12-
or = { path = "../or" }
11+
or-rs-macros = { path = "../or-rs-macros" }
12+
or-rs = { path = "../or-rs" }
1313

‎tests/tests/integration_test.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#![feature(proc_macro_hygiene)] // for now, you have to add this unstable feature flag
22

3-
use macros::or_gen;
4-
use or::enums::*;
3+
use or_rs::enums::*;
4+
use or_rs_macros::or_gen;
55

66
fn main() {
77
#[or_gen]
@@ -50,8 +50,8 @@ mod test {
5050

5151
#[test]
5252
fn test_or_gen() {
53-
use macros::or_gen;
54-
use or::enums::*;
53+
use or_rs::enums::*;
54+
use or_rs_macros::or_gen;
5555

5656
#[or_gen]
5757
let x: Or3<i32, String, f32> = if true {
@@ -71,6 +71,7 @@ mod test {
7171
assert_eq!(z.as_t1().unwrap(), 9);
7272
}
7373

74+
#[allow(dead_code, unused_variables)]
7475
#[test]
7576
fn test_match() {
7677
let a = 3;

‎tests/tests/macro_test.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#![feature(proc_macro_hygiene)]
2+
#![allow(unused_variables)]
23

3-
use macros::or_gen;
4+
use or_rs_macros::or_gen;
45

56
#[test]
67
fn test_compile() {
7-
use macros::or_gen;
8-
use or::enums::*;
8+
use or_rs::enums::*;
9+
use or_rs_macros::or_gen;
910

1011
fn f1() -> i32 {
1112
42

0 commit comments

Comments
 (0)
Please sign in to comment.