Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libc
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
felixmoebius
libc
Commits
4bd0c000
Commit
4bd0c000
authored
5 years ago
by
bors
Browse files
Options
Downloads
Plain Diff
Auto merge of #1475 - gnzlbg:fix_build, r=gnzlbg
Remove unnecessary trailing semi-colon
parents
dab1050e
3241ec58
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.rs
+5
-1
5 additions, 1 deletion
build.rs
ci/azure.yml
+3
-3
3 additions, 3 deletions
ci/azure.yml
src/lib.rs
+3
-1
3 additions, 1 deletion
src/lib.rs
with
11 additions
and
5 deletions
build.rs
+
5
−
1
View file @
4bd0c000
...
...
@@ -7,7 +7,6 @@ fn main() {
rustc_minor_version
()
.expect
(
"Failed to get rustc version"
);
let
rustc_dep_of_std
=
env
::
var
(
"CARGO_FEATURE_RUSTC_DEP_OF_STD"
)
.is_ok
();
let
align_cargo_feature
=
env
::
var
(
"CARGO_FEATURE_ALIGN"
)
.is_ok
();
#[allow(unused)]
let
libc_ci
=
env
::
var
(
"LIBC_CI"
)
.is_ok
();
if
env
::
var
(
"CARGO_FEATURE_USE_STD"
)
.is_ok
()
{
...
...
@@ -28,6 +27,11 @@ fn main() {
Some
(
_
)
|
None
=>
println!
(
"cargo:rustc-cfg=freebsd11"
),
}
// On CI: deny all warnings
if
libc_ci
{
println!
(
"cargo:rustc-cfg=libc_deny_warnings"
);
}
// Rust >= 1.15 supports private module use:
if
rustc_minor_ver
>=
15
||
rustc_dep_of_std
{
println!
(
"cargo:rustc-cfg=libc_priv_mod_use"
);
...
...
This diff is collapsed.
Click to expand it.
ci/azure.yml
+
3
−
3
View file @
4bd0c000
...
...
@@ -136,7 +136,7 @@ jobs:
-
template
:
azure-install-rust.yml
-
script
:
sh ci/style.sh
displayName
:
Check style
-
script
:
sh ci/dox.sh
-
script
:
LIBC_CI=1
sh ci/dox.sh
displayName
:
Generate documentation
-
template
:
azure-configs/static-websites.yml@rustinfra
parameters
:
...
...
@@ -169,7 +169,7 @@ jobs:
vmImage
:
ubuntu-16.04
steps
:
-
template
:
azure-install-rust.yml
-
script
:
sh ./ci/build.sh
-
script
:
LIBC_CI=1
sh ./ci/build.sh
displayName
:
Execute build.sh
strategy
:
matrix
:
...
...
@@ -198,7 +198,7 @@ jobs:
vmImage
:
macos-10.13
steps
:
-
template
:
azure-install-rust.yml
-
script
:
sh ./ci/build.sh
-
script
:
LIBC_CI=1
sh ./ci/build.sh
displayName
:
Execute build.sh
strategy
:
matrix
:
...
...
This diff is collapsed.
Click to expand it.
src/lib.rs
+
3
−
1
View file @
4bd0c000
...
...
@@ -14,8 +14,10 @@
//! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation
#![crate_name
=
"libc"
]
#![crate_type
=
"rlib"
]
#![cfg_attr(
not(feature
=
"rustc-dep-of-std"
)
,
deny(warnings))]
#![cfg_attr(
libc_deny_warnings
,
deny(warnings))]
#![allow(bad_style,
overflowing_literals,
improper_ctypes,
unknown_lints)]
// FIXME: this is due to a rustc bug
#![allow(redundant_semicolon)]
// Attributes needed when building as part of the standard library
#![cfg_attr(
feature
=
"rustc-dep-of-std"
,
...
...
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