Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
nucleo-64-rtfm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Per Lindgren
nucleo-64-rtfm
Commits
0e05682d
Commit
0e05682d
authored
7 years ago
by
Jorge Aparicio
Browse files
Options
Downloads
Patches
Plain Diff
more "hygiene"
prepend an underscore to the name of the statics generated in the root of the crate
parent
a14b0121
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
macros/src/trans.rs
+12
-8
12 additions, 8 deletions
macros/src/trans.rs
with
12 additions
and
8 deletions
macros/src/trans.rs
+
12
−
8
View file @
0e05682d
...
@@ -184,6 +184,7 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
...
@@ -184,6 +184,7 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
let
mut
rexprs
=
vec!
[];
let
mut
rexprs
=
vec!
[];
for
(
name
,
resource
)
in
&
app
.resources
{
for
(
name
,
resource
)
in
&
app
.resources
{
let
_name
=
Ident
::
new
(
format!
(
"_{}"
,
name
.as_ref
()));
lifetime
=
Some
(
quote!
(
'a
));
lifetime
=
Some
(
quote!
(
'a
));
let
ty
=
&
resource
.ty
;
let
ty
=
&
resource
.ty
;
...
@@ -193,7 +194,7 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
...
@@ -193,7 +194,7 @@ fn init(app: &App, main: &mut Vec<Tokens>, root: &mut Vec<Tokens>) {
});
});
rexprs
.push
(
quote!
{
rexprs
.push
(
quote!
{
#
name
:
::
#
krate
::
Static
::
ref_mut
(
&
mut
super
::
#
name
),
#
name
:
::
#
krate
::
Static
::
ref_mut
(
&
mut
::
#
_
name
),
});
});
}
}
...
@@ -298,6 +299,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -298,6 +299,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
for
(
name
,
ownership
)
in
ownerships
{
for
(
name
,
ownership
)
in
ownerships
{
let
mut
impl_items
=
vec!
[];
let
mut
impl_items
=
vec!
[];
let
_name
=
Ident
::
new
(
format!
(
"_{}"
,
name
.as_ref
()));
match
*
ownership
{
match
*
ownership
{
Ownership
::
Owned
{
..
}
=>
{
Ownership
::
Owned
{
..
}
=>
{
if
let
Some
(
resource
)
=
app
.resources
.get
(
name
)
{
if
let
Some
(
resource
)
=
app
.resources
.get
(
name
)
{
...
@@ -306,7 +308,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -306,7 +308,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
let
ty
=
&
resource
.ty
;
let
ty
=
&
resource
.ty
;
root
.push
(
quote!
{
root
.push
(
quote!
{
static
mut
#
name
:
#
ty
=
#
expr
;
static
mut
#
_
name
:
#
ty
=
#
expr
;
});
});
}
else
{
}
else
{
// Peripheral
// Peripheral
...
@@ -319,7 +321,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -319,7 +321,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
let
ty
=
&
resource
.ty
;
let
ty
=
&
resource
.ty
;
root
.push
(
quote!
{
root
.push
(
quote!
{
static
mut
#
name
:
#
ty
=
#
expr
;
static
mut
#
_
name
:
#
ty
=
#
expr
;
});
});
impl_items
.push
(
quote!
{
impl_items
.push
(
quote!
{
...
@@ -329,7 +331,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -329,7 +331,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
&
'cs
self
,
&
'cs
self
,
_cs
:
&
'cs
#
krate
::
CriticalSection
,
_cs
:
&
'cs
#
krate
::
CriticalSection
,
)
->
&
'cs
#
krate
::
Static
<
#
ty
>
{
)
->
&
'cs
#
krate
::
Static
<
#
ty
>
{
unsafe
{
#
krate
::
Static
::
ref_
(
&
#
name
)
}
unsafe
{
#
krate
::
Static
::
ref_
(
&
#
_
name
)
}
}
}
fn
borrow_mut
<
'cs
>
(
fn
borrow_mut
<
'cs
>
(
...
@@ -337,7 +339,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -337,7 +339,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
_cs
:
&
'cs
#
krate
::
CriticalSection
,
_cs
:
&
'cs
#
krate
::
CriticalSection
,
)
->
&
'cs
mut
#
krate
::
Static
<
#
ty
>
{
)
->
&
'cs
mut
#
krate
::
Static
<
#
ty
>
{
unsafe
{
unsafe
{
#
krate
::
Static
::
ref_mut
(
&
mut
#
name
)
#
krate
::
Static
::
ref_mut
(
&
mut
#
_
name
)
}
}
}
}
...
@@ -353,7 +355,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -353,7 +355,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
{
{
unsafe
{
unsafe
{
#
krate
::
claim
(
#
krate
::
claim
(
#
krate
::
Static
::
ref_
(
&
#
name
),
#
krate
::
Static
::
ref_
(
&
#
_
name
),
#
ceiling
,
#
ceiling
,
#
device
::
NVIC_PRIO_BITS
,
#
device
::
NVIC_PRIO_BITS
,
t
,
t
,
...
@@ -374,7 +376,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -374,7 +376,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
{
{
unsafe
{
unsafe
{
#
krate
::
claim
(
#
krate
::
claim
(
#
krate
::
Static
::
ref_mut
(
&
mut
#
name
),
#
krate
::
Static
::
ref_mut
(
&
mut
#
_
name
),
#
ceiling
,
#
ceiling
,
#
device
::
NVIC_PRIO_BITS
,
#
device
::
NVIC_PRIO_BITS
,
t
,
t
,
...
@@ -503,6 +505,8 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -503,6 +505,8 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
if
has_resources
{
if
has_resources
{
for
name
in
&
task
.resources
{
for
name
in
&
task
.resources
{
let
_name
=
Ident
::
new
(
format!
(
"_{}"
,
name
.as_ref
()));
match
ownerships
[
name
]
{
match
ownerships
[
name
]
{
Ownership
::
Shared
{
ceiling
}
Ownership
::
Shared
{
ceiling
}
if
ceiling
>
task
.priority
=>
if
ceiling
>
task
.priority
=>
...
@@ -530,7 +534,7 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
...
@@ -530,7 +534,7 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
});
});
exprs
.push
(
quote!
{
exprs
.push
(
quote!
{
#
name
:
::
#
krate
::
Static
::
ref_mut
(
&
mut
super
::
#
name
),
#
name
:
::
#
krate
::
Static
::
ref_mut
(
&
mut
::
#
_
name
),
});
});
}
else
{
}
else
{
fields
.push
(
quote!
{
fields
.push
(
quote!
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment